372c80012b671dc999ba5ea3b41ab6e7b0402133 - chromium/src

[aliona...@google.com]

commit 372c80012b671dc999ba5ea3b41ab6e7b0402133
Author: Aliona DANGLA <aliona...@google.com>
AuthorDate: Thu Dec 16 18:09:19 2021
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Thu Dec 16 18:09:19 2021

[iOS] Update passwords settings header

This CL:
* Revert https://crrev.com/c/3276194
* Update passwords settings header

See:
https://drive.google.com/file/d/1UVnrDCaBn11dMW4-0yh5H_tmIpto6O7a/view?usp=sharing&resourcekey=0-z8PSgEKi1RZScsXpFHLeEg

Learn more video:
https://drive.google.com/file/d/1dTs7B85VphyL2JUdI1-x7o47eeo1jXOF/view?usp=sharing&resourcekey=0-seXobAxwW5AMWbMe0KX--w

Fixed: 1280336
Change-Id: I9de576e10340a366029a42d52cf83b3d406b27ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3341530
Reviewed-by: Gauthier Ambard <gam...@chromium.org>
Reviewed-by: Vasilii Sukhanov <vas...@chromium.org>
Commit-Queue: Aliona Dangla <aliona...@google.com>
Cr-Commit-Position: refs/heads/main@{#952436}

diff --git a/components/password_manager/core/browser/password_manager_constants.cc b/components/password_manager/core/browser/password_manager_constants.cc
index b7f898d..17b9020 100644
--- a/components/password_manager/core/browser/password_manager_constants.cc
+++ b/components/password_manager/core/browser/password_manager_constants.cc
@@ -16,6 +16,9 @@
const char kPasswordManagerAccountDashboardURL[] =
"https://passwords.google.com";

+const char kPasswordManagerHelpCenteriOSURL[] =
+ "https://support.google.com/chrome/answer/95606?ios=1";
+
const char kPasswordManagerHelpCenterSmartLock[] =
"https://support.google.com/accounts?p=smart_lock_chrome";

diff --git a/components/password_manager/core/browser/password_manager_constants.h b/components/password_manager/core/browser/password_manager_constants.h
index 249ee57..b0020d2 100644
--- a/components/password_manager/core/browser/password_manager_constants.h
+++ b/components/password_manager/core/browser/password_manager_constants.h
@@ -16,6 +16,9 @@
// URL to the password manager account dashboard.
extern const char kPasswordManagerAccountDashboardURL[];

+// URL to the password manager help center.
+extern const char kPasswordManagerHelpCenteriOSURL[];
+
// URL to the help center article about Smart Lock;
// TODO(crbug.com/862269): remove when "Smart Lock" is completely gone.
extern const char kPasswordManagerHelpCenterSmartLock[];
diff --git a/ios/chrome/app/strings/ios_chromium_strings.grd b/ios/chrome/app/strings/ios_chromium_strings.grd
index 01077ae..4ec5fe1 100644
--- a/ios/chrome/app/strings/ios_chromium_strings.grd
+++ b/ios/chrome/app/strings/ios_chromium_strings.grd
@@ -289,9 +289,6 @@
<message name="IDS_IOS_FIRSTRUN_WELCOME_TO_CHROME" desc="Title on the Welcome to Chromium screen presented to the user on First Run. [iOS only]">
Welcome to Chromium
</message>
- <message name="IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER" desc="Header text and link for the view in Settings for managing saved passwords when the user is signed in and syncing passwords. [Length: unlimited] [iOS only]">
- Passwords are saved to <ph name="BEGIN_LINK">BEGIN_LINK</ph>Password Manager<ph name="END_LINK">END_LINK</ph> so you can use them on any device.
- </message>
<message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_IMPROVE_CHROME_TEXT" desc="Feature title in the settings for the user enable or disable. Related with 'Automatically sends usage statistics and crash reports to Google'. [iOS only]">
Help Improve Chromium's Features and Performance
</message>
@@ -367,9 +364,6 @@
<message name="IDS_IOS_SAVE_IMAGE_PRIVACY_ALERT_MESSAGE_GO_TO_SETTINGS" desc="Body of the alert shown when the user tries to save an image but we lack permission to add photos. This body tells the user he'll be redirected to the Settings app. [Length: 100em] [iOS only].">
To save images, tap on Settings to let Chromium add to your photos
</message>
- <message name="IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER" desc="Header text for the view in Settings for managing saved passwords when the user is not signed in, or signed in and not syncing passwords. [Length: unlimited] [iOS only]">
- Passwords are saved to Password Manager on this device only.
- </message>
<message name="IDS_IOS_SCANNER_CAMERA_IN_USE_ALERT_DETAIL" desc="Body of a modal dialog shown when the user tries to open the QR or credit card scanner but the camera is in use by another application. [Length: 140em] [iOS only]">
Chromium can't use your camera because it's in use by another application
</message>
diff --git a/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER.png.sha1 b/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER.png.sha1
deleted file mode 100644
index d4661c2..0000000
--- a/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bb352378379999450f8ca6c1c1d82ddafc8e66b9
\ No newline at end of file
diff --git a/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER.png.sha1 b/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER.png.sha1
deleted file mode 100644
index 6afe11a..0000000
--- a/ios/chrome/app/strings/ios_chromium_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee69e0ab71b06c73a045876870cf629ef6908703
\ No newline at end of file
diff --git a/ios/chrome/app/strings/ios_google_chrome_strings.grd b/ios/chrome/app/strings/ios_google_chrome_strings.grd
index e6662fe..e7581b5 100644
--- a/ios/chrome/app/strings/ios_google_chrome_strings.grd
+++ b/ios/chrome/app/strings/ios_google_chrome_strings.grd
@@ -289,9 +289,6 @@
<message name="IDS_IOS_FIRSTRUN_WELCOME_TO_CHROME" desc="Title on the Welcome to Chrome screen presented to the user on First Run. [iOS only]">
Welcome to Chrome
</message>
- <message name="IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER" desc="Header text and link for the view in Settings for managing saved passwords when the user is signed in and syncing passwords. [Length: unlimited] [iOS only]">
- Passwords are saved to <ph name="BEGIN_LINK">BEGIN_LINK</ph>Google Password Manager<ph name="END_LINK">END_LINK</ph> so you can use them on any device.
- </message>
<message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_IMPROVE_CHROME_TEXT" desc="Feature title in the settings for the user enable or disable. Related with 'Automatically sends usage statistics and crash reports to Google'. [iOS only]">
Help Improve Chrome's Features and Performance
</message>
@@ -367,9 +364,6 @@
<message name="IDS_IOS_SAVE_IMAGE_PRIVACY_ALERT_MESSAGE_GO_TO_SETTINGS" desc="Body of the alert shown when the user tries to save an image but we lack permission to add to photos. This body tells the user he'll be redirected to the Settings app. [Length: 100em] [iOS only].">
To save images, tap on Settings to let Chrome add to your photos
</message>
- <message name="IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER" desc="Header text for the view in Settings for managing saved passwords when the user is not signed in, or signed in and not syncing passwords. [Length: unlimited] [iOS only]">
- Passwords are saved to Google Password Manager on this device only.
- </message>
<message name="IDS_IOS_SCANNER_CAMERA_IN_USE_ALERT_DETAIL" desc="Body of a modal dialog shown when the user tries to open the QR scanner but the camera is in use by another application. [Length: 140em] [iOS only]">
Google Chrome can't use your camera because it's in use by another application
</message>
diff --git a/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER.png.sha1 b/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER.png.sha1
deleted file mode 100644
index d4661c2..0000000
--- a/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bb352378379999450f8ca6c1c1d82ddafc8e66b9
\ No newline at end of file
diff --git a/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER.png.sha1 b/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER.png.sha1
deleted file mode 100644
index 6afe11a..0000000
--- a/ios/chrome/app/strings/ios_google_chrome_strings_grd/IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee69e0ab71b06c73a045876870cf629ef6908703
\ No newline at end of file
diff --git a/ios/chrome/app/strings/ios_strings.grd b/ios/chrome/app/strings/ios_strings.grd
index 0735c34..be1dbca 100644
--- a/ios/chrome/app/strings/ios_strings.grd
+++ b/ios/chrome/app/strings/ios_strings.grd
@@ -2012,6 +2012,9 @@
<message name="IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT" desc="Header text with link for the view in Settings for managing saved passwords. [Length: unlimited] [iOS only]">
View and manage saved passwords at <ph name="BEGIN_LINK">BEGIN_LINK</ph>passwords.google.com<ph name="END_LINK">END_LINK</ph>
</message>
+ <message name="IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT_HEADER" desc="Header text with link for the view in Settings for managing saved passwords. [Length: unlimited] [iOS only]">
+ Create, save, and manage your passwords so you can easily sign in to sites and apps. <ph name="BEGIN_LINK">BEGIN_LINK</ph>Learn more<ph name="END_LINK">END_LINK</ph>
+ </message>
<message name="IDS_IOS_CHECK_PASSWORDS" desc="Title for the item in Settings for Password Check feature" meaning="Label tells the user about status of Password Check [CHAR_LIMIT=25] [iOS only]">
Check Passwords
</message>
diff --git a/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT_HEADER.png.sha1 b/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT_HEADER.png.sha1
new file mode 100644
index 0000000..f05db42
--- /dev/null
+++ b/ios/chrome/app/strings/ios_strings_grd/IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT_HEADER.png.sha1
@@ -0,0 +1 @@
+61da3db6b0ea6ec810715325834460b6158ec898
\ No newline at end of file
diff --git a/ios/chrome/browser/ui/settings/password/BUILD.gn b/ios/chrome/browser/ui/settings/password/BUILD.gn
index 4ce5e096..1665cd1 100644
--- a/ios/chrome/browser/ui/settings/password/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/password/BUILD.gn
@@ -83,7 +83,6 @@
"//ios/chrome/browser/net:crurl",
"//ios/chrome/browser/passwords",
"//ios/chrome/browser/signin",
- "//ios/chrome/browser/sync",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/commands",
"//ios/chrome/browser/ui/elements",
diff --git a/ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm b/ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm
index 36a9b3a..958486e 100644
--- a/ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/password/passwords_table_view_controller.mm
@@ -29,8 +29,6 @@
#import "ios/chrome/browser/net/crurl.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
#import "ios/chrome/browser/signin/chrome_account_manager_service_observer_bridge.h"
-#import "ios/chrome/browser/sync/sync_setup_service.h"
-#import "ios/chrome/browser/sync/sync_setup_service_factory.h"
#include "ios/chrome/browser/system_flags.h"
#import "ios/chrome/browser/ui/elements/home_waiting_view.h"
#import "ios/chrome/browser/ui/settings/cells/settings_check_cell.h"
@@ -630,38 +628,29 @@
#pragma mark - Items

- (TableViewLinkHeaderFooterItem*)manageAccountLinkItem {
- SyncSetupService* syncSetupService =
- SyncSetupServiceFactory::GetForBrowserState(_browserState);
- syncer::ModelType kSyncPasswordsModelType =
- syncSetupService->GetModelType(SyncSetupService::kSyncPasswords);
- BOOL isSyncingPasswords =
- syncSetupService->IsDataTypePreferred(kSyncPasswordsModelType) &&
- syncSetupService->IsSyncRequested();
-
TableViewLinkHeaderFooterItem* footerItem =
[[TableViewLinkHeaderFooterItem alloc] initWithType:ItemTypeLinkHeader];

- if (!base::FeatureList::IsEnabled(
+ if (base::FeatureList::IsEnabled(
password_manager::features::
kIOSEnablePasswordManagerBrandingUpdate)) {
footerItem.text =
- l10n_util::GetNSString(IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT);
+ l10n_util::GetNSString(IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT_HEADER);
+
footerItem.urls = @[ [[CrURL alloc]
initWithGURL:
google_util::AppendGoogleLocaleParam(
- GURL(password_manager::kPasswordManagerAccountDashboardURL),
- GetApplicationContext()->GetApplicationLocale())] ];
- } else if (isSyncingPasswords) {
- footerItem.text =
- l10n_util::GetNSString(IDS_IOS_PASSWORD_MANAGER_SETTINGS_SYNC_HEADER);
- footerItem.urls = @[ [[CrURL alloc]
- initWithGURL:
- google_util::AppendGoogleLocaleParam(
- GURL(password_manager::kPasswordManagerAccountDashboardURL),
+ GURL(password_manager::kPasswordManagerHelpCenteriOSURL),
GetApplicationContext()->GetApplicationLocale())] ];
} else {
- footerItem.text = l10n_util::GetNSString(
- IDS_IOS_PASSWORD_MANAGER_SETTINGS_NOT_SYNC_HEADER);
+ footerItem.text =
+ l10n_util::GetNSString(IDS_IOS_SAVE_PASSWORDS_MANAGE_ACCOUNT);
+
+ footerItem.urls = @[ [[CrURL alloc]
+ initWithGURL:
+ google_util::AppendGoogleLocaleParam(
+ GURL(password_manager::kPasswordManagerAccountDashboardURL),
+ GetApplicationContext()->GetApplicationLocale())] ];
}

return footerItem;