diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 406b8bad8f69dc..590138cd17f230 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6641,7 +6641,7 @@ the Bookmarks menu."> You can customize what information Google collects in <a id="settingsLink" href="chrome://settings">Settings</a></a> anytime. - Google may use content on sites you visit and browsing activity and interactions to personalize Chrome and other Google services like Translate, Search, and ads. You can customize this in Settings. + Google may use content on sites you visit, plus browser activity and interactions, to personalize Chrome and other Google services like Translate, Search, and ads. You can customize this in Settings. Ok, got it diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp index c35df4676d88cc..fd9dc5fc8b7766 100644 --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp @@ -2400,7 +2400,7 @@ - Autocomplete searches and web addresses + Autocomplete searches and URLs Sends searches from the address bar and search box and some cookies to your default search engine @@ -2498,6 +2498,9 @@ For more settings that relate to privacy, security, and data collection, see <a href="chrome://settings/syncSetup"><a href="chrome://settings/syncSetup">Sync and personalization</a></a> + + For more settings that relate to privacy, security, and data collection, see <a href="chrome://settings/syncSetup"><a href="chrome://settings/syncSetup">Sync and Google services</a></a> + @@ -3444,6 +3447,9 @@ Turn off sync and sign out? + + Turn off sync and personalization? + Clear and continue @@ -3464,6 +3470,9 @@ This will sign you out of your Google accounts. Changes to your bookmarks, history, passwords, and other settings will no longer be synced to your Google Account. However, your existing data will remain stored in your Google Account and can be managed on <a href="$1" target="_blank"><a href="$1" target="_blank">Google Dashboard</a></a>. + + This will sign you out of your Google Accounts. Your bookmarks, history, passwords, and more will no longer be synced. + Show profile stats @@ -3556,7 +3565,7 @@ Activity and interactions - User content on sites you visit and browser activity and interactions for personalization + Uses content on sites you visit, plus browser activity and interactions, for personalization Manage synced data on Google Dashboard @@ -3579,6 +3588,9 @@ To change this setting, <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a>. + + To turn this on, <a href="$1" target="_blank"><a href="$1" target="_blank">reset sync</a></a> to remove your sync passphrase + Empty passphrase is not allowed diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc index 81ff7583da1ac9..d287399535516f 100644 --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc @@ -1739,8 +1739,11 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) { base::ASCIIToUTF16(sync_dashboard_url))); html_source->AddString( "passphraseResetHint", - l10n_util::GetStringFUTF8(IDS_SETTINGS_PASSPHRASE_RESET_HINT, - base::ASCIIToUTF16(sync_dashboard_url))); + l10n_util::GetStringFUTF8( + IsUnifiedConsentEnabled(profile) + ? IDS_SETTINGS_PASSPHRASE_RESET_HINT_UNIFIED_CONSENT + : IDS_SETTINGS_PASSPHRASE_RESET_HINT, + base::ASCIIToUTF16(sync_dashboard_url))); html_source->AddString( "passphraseRecover", l10n_util::GetStringFUTF8(IDS_SETTINGS_PASSPHRASE_RECOVER, @@ -1762,7 +1765,9 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) { LocalizedString sync_disconnect_strings[] = { {"syncDisconnect", IDS_SETTINGS_PEOPLE_SYNC_TURN_OFF}, {"syncDisconnectTitle", - IDS_SETTINGS_TURN_OFF_SYNC_AND_SIGN_OUT_DIALOG_TITLE}, + IsUnifiedConsentEnabled(profile) + ? IDS_SETTINGS_TURN_OFF_SYNC_AND_SIGN_OUT_DIALOG_TITLE_UNIFIED_CONSENT + : IDS_SETTINGS_TURN_OFF_SYNC_AND_SIGN_OUT_DIALOG_TITLE}, {"syncDisconnectDeleteProfile", IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_CHECKBOX}, {"syncDisconnectConfirm", @@ -1771,11 +1776,17 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) { AddLocalizedStringsBulk(html_source, sync_disconnect_strings, arraysize(sync_disconnect_strings)); - html_source->AddString( - "syncDisconnectExplanation", - l10n_util::GetStringFUTF8( - IDS_SETTINGS_SYNC_DISCONNECT_AND_SIGN_OUT_EXPLANATION, - base::ASCIIToUTF16(sync_dashboard_url))); + if (IsUnifiedConsentEnabled(profile)) { + html_source->AddLocalizedString( + "syncDisconnectExplanation", + IDS_SETTINGS_SYNC_DISCONNECT_AND_SIGN_OUT_EXPLANATION_UNIFIED_CONSENT); + } else { + html_source->AddString( + "syncDisconnectExplanation", + l10n_util::GetStringFUTF8( + IDS_SETTINGS_SYNC_DISCONNECT_AND_SIGN_OUT_EXPLANATION, + base::ASCIIToUTF16(sync_dashboard_url))); + } } #endif @@ -1924,7 +1935,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION}, {"safeBrowsingEnableProtectionDesc", IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC}, - {"syncAndPersonalizationLink", IDS_SETTINGS_PRIVACY_MORE_SETTINGS}, {"urlKeyedAnonymizedDataCollection", IDS_SETTINGS_ENABLE_URL_KEYED_ANONYMIZED_DATA_COLLECTION}, {"urlKeyedAnonymizedDataCollectionDesc", @@ -1950,6 +1960,8 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"spellingPref", IDS_SETTINGS_SPELLING_PREF_UNIFIED_CONSENT}, {"spellingDescription", IDS_SETTINGS_SPELLING_DESCRIPTION_UNIFIED_CONSENT}, + {"syncAndPersonalizationLink", + IDS_SETTINGS_PRIVACY_MORE_SETTINGS_UNIFIED_CONSENT}, {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_UNIFIED_CONSENT}, {"enableLoggingDesc", IDS_SETTINGS_ENABLE_LOGGING_DESC_UNIFIED_CONSENT}, }; @@ -1966,6 +1978,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"linkDoctorPrefDesc", IDS_SETTINGS_EMPTY_STRING}, {"spellingPref", IDS_SETTINGS_SPELLING_PREF}, {"spellingDescription", IDS_SETTINGS_SPELLING_DESCRIPTION}, + {"syncAndPersonalizationLink", IDS_SETTINGS_PRIVACY_MORE_SETTINGS}, #if defined(OS_CHROMEOS) {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_DIAGNOSTIC_AND_USAGE_DATA}, #else diff --git a/chrome/test/data/webui/signin/sync_confirmation_test.js b/chrome/test/data/webui/signin/sync_confirmation_test.js index 706436ae359f38..1466a8fa1c8c99 100644 --- a/chrome/test/data/webui/signin/sync_confirmation_test.js +++ b/chrome/test/data/webui/signin/sync_confirmation_test.js @@ -50,9 +50,9 @@ cr.define('signin_sync_confirmation', function() { 'Personalized Google services like Google Pay', 'Improve Chrome and its security by sending system and usage ' + 'information to Google', - 'Google may use content on sites you visit and browsing activity and ' + - 'interactions to personalize Chrome and other Google services like ' + - 'Translate, Search, and ads. You can customize this in Settings.', + 'Google may use content on sites you visit, plus browser activity and ' + + 'interactions, to personalize Chrome and other Google services ' + + 'like Translate, Search, and ads. You can customize this in Settings.' ];