Skip to content

GitLab

T
tangled
Commit 6be7da76 authored by Thomas Tangl's avatar Thomas Tangl Committed by Commit Bot
Browse files
Options

[unified-consent] Update sync confirmation dialog 

Before:
https://drive.google.com/file/d/1CGW5Lfwln-jO1d_yCleuOtYv8lIRFyiy/view?usp=sharing

After:
https://drive.google.com/file/d/1oXkLoEzcUjto-0wvG9tKiPfC1jEbtU9u/view?usp=sharing

Bug: 914030
Change-Id: I5dea177a8cb0c479ce491729a80fd5e88d5cfd5e
Reviewed-on: https://chromium-review.googlesource.com/c/1371880
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: default avatarScott Chen <scottchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615893}
parent 8bf4776d
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 93 deletions
chrome/app/generated_resources.grd
View file @ 6be7da76
......@@ -6692,6 +6692,24 @@ the Bookmarks menu.">
<message name="IDS_SYNC_CONFIRMATION_UNITY_TITLE" desc="Title of the sync confirmation dialog in the tab modal signin flow when Unity is enabled">
Get Google smarts in Chrome
</message>
<message name="IDS_SYNC_CONFIRMATION_UNITY_SYNC_INFO_TITLE" desc="Title in the information about sync on the sync confirmation dialog when Unity is enabled">
Sync your bookmarks, passwords, history, and more on all your devices
</message>
<message name="IDS_SYNC_CONFIRMATION_UNITY_SYNC_INFO_DESC" desc="Description in the information about sync on the sync confirmation dialog when Unity is enabled">
Google may use your history to personalize Search, ads, and other Google services.
</message>
<message name="IDS_SYNC_CONFIRMATION_UNITY_SPELLCHECK_INFO_TITLE" desc="Title in the information about spellcheck on the sync confirmation dialog when Unity is enabled">
Fix spelling errors with enhanced spell check
</message>
<message name="IDS_SYNC_CONFIRMATION_UNITY_SPELLCHECK_INFO_DESC" desc="Description in the information about spellcheck on the sync confirmation dialog when Unity is enabled">
The text you type in text fields will be sent to Google.
</message>
<message name="IDS_SYNC_CONFIRMATION_UNITY_IMPROVE_CHROME_INFO_TITLE" desc="Title in the information about improving Chrome on the sync confirmation dialog when Unity is enabled">
Help improve Chrome and its security
</message>
<message name="IDS_SYNC_CONFIRMATION_UNITY_IMPROVE_CHROME_INFO_DESC" desc="Description in the information about improving Chrome on the sync confirmation dialog when Unity is enabled">
Anonymous system and usage data will be sent to Google.
</message>
<!-- "Chrome sync" is the Google Cloud Based service used for sync. Thus this string resource is set to "Chrome sync" even for Chromium builds. -->
<message name="IDS_SYNC_CONFIRMATION_CHROME_SYNC_TITLE" desc="Title of the chrome sync section of the sync confirmation dialog in the tab modal signin flow" formatter_data="android_java">
......@@ -6700,33 +6718,18 @@ the Bookmarks menu.">
<message name="IDS_SYNC_CONFIRMATION_CHROME_SYNC_MESSAGE" desc="Body of the chrome sync section of the sync confirmation dialog in the tab modal signin flow" formatter_data="android_java">
Your bookmarks, history, passwords, and other settings will be synced to your Google Account so you can use them on all your devices
</message>
<message name="IDS_SYNC_CONFIRMATION_DICE_CHROME_SYNC_MESSAGE" desc="Body of the chrome sync section of the sync confirmation dialog in the tab modal signin flow">
Your bookmarks, passwords, history, and more on all your devices
</message>
<message name="IDS_SYNC_CONFIRMATION_PERSONALIZE_SERVICES_TITLE" desc="Title of the personalize services section of the sync confirmation dialog in the tab modal signin flow" formatter_data="android_java">
Personalize Google services
</message>
<message name="IDS_SYNC_CONFIRMATION_PERSONALIZE_SERVICES_BODY" desc="Body of the personalize services section of the sync confirmation dialog in the tab modal signin flow" formatter_data="android_java">
Google may use your browsing history to personalize Search, ads, and other Google services
</message>
<message name="IDS_SYNC_CONFIRMATION_DICE_PERSONALIZE_SERVICES_BODY" desc="Body of the personalize services section of the sync confirmation dialog in the tab modal signin flow">
More personal Google services, like better page suggestions
</message>
<message name="IDS_SYNC_CONFIRMATION_PERSONALIZE_SERVICES_BODY_CHILD_ACCOUNT" desc="Body of the personalize services section of the sync confirmation dialog in the tab modal signin flow for child accounts" formatter_data="android_java">
Google may use your browsing history to personalize Search and other Google services
</message>
<message name="IDS_SYNC_CONFIRMATION_DICE_GOOGLE_SERVICES_BODY" desc="Body of the google services section of the sync confirmation dialog in the tab modal signin flow">
Improve Chrome and its security by sending system and usage information to Google
</message>
<message name="IDS_SYNC_CONFIRMATION_SYNC_SETTINGS_LINK_BODY" desc="Label of the section containing the link to go to the sync setting page.">
Want to manage sync and personalization before they’re turned on? Visit <ph name="BEGIN_LINK">&lt;a id="settingsLink" href="chrome://settings"&gt;</ph>Settings<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
</message>
<message name="IDS_SYNC_CONFIRMATION_DICE_SYNC_SETTINGS_LINK_BODY" desc="Label of the section containing the link to go to the sync setting page.">
You can customize what information Google collects in <ph name="BEGIN_LINK">&lt;a id="settingsLink" href="chrome://settings"&gt;</ph>Settings<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph> anytime.
</message>
<message name="IDS_SYNC_CONFIRMATION_DICE_SYNC_SETTINGS_DESCRIPTION" desc="Body of the personalize services section of the sync confirmation dialog in the tab modal signin flow for child accounts">
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.
</message>
<message name="IDS_SYNC_CONFIRMATION_DICE_CONFIRM_BUTTON_LABEL" desc="Label of the confirmation button in the sync confirmation dialog of the tab modal signin flow">
Yes, I'm in
</message>
......
chrome/browser/resources/signin/dice_sync_confirmation/icons.html
View file @ 6be7da76
......@@ -4,8 +4,8 @@
<iron-iconset-svg name="sync-confirmation" size="24">
<svg>
<defs>
<g id="assistant"><path d="M19 2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h4l3 3 3-3h4c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-5.12 10.88L12 17l-1.88-4.12L6 11l4.12-1.88L12 5l1.88 4.12L18 11l-4.12 1.88z"></path></g>
<g id="settings"><path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"></path></g>
<g id="lock"><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"></path></g>
<g id="spellcheck"><path d="M12.45 16h2.09L9.43 3H7.57L2.46 16h2.09l1.12-3h5.64l1.14 3zm-6.02-5L8.5 5.48 10.57 11H6.43zm15.16.59l-8.09 8.09L9.83 16l-1.41 1.41 5.09 5.09L23 13l-1.41-1.41z"></path></g>
</defs>
</svg>
</iron-iconset-svg>
chrome/browser/resources/signin/dice_sync_confirmation/sync_confirmation_app.html
View file @ 6be7da76
......@@ -87,22 +87,13 @@
}
.message-container {
color: var(--paper-grey-800);
display: flex;
line-height: 20px;
margin-bottom: 16px;
padding: 0 24px;
}
.footer::before {
border-top: 2px solid var(--paper-grey-200);
content: '';
display: block;
height: 1;
margin: 24px 0 24px 56px;
}
.footer .message-container {
.secondary {
color: var(--paper-grey-600);
}
......@@ -116,31 +107,16 @@
width: 16px;
}
#personalize-logo {
/* Need the following rules to adjust for white spacing in the svg. */
fill: var(--google-blue-700);
height: 18px;
margin-inline-end: 14px;
width: 18px;
}
#sync-logo-container {
align-items: center;
background: green;
border-radius: 50%;
display: flex;
#sync-logo {
fill: var(--google-green-700);
}
#sync-logo-container iron-icon {
fill: white;
height: 12px;
margin: auto;
width: 12px;
#spellcheck-logo {
fill: var(--google-blue-700);
}
#googleg-logo {
background-image: -webkit-image-set(url(./images/ic_google.png) 1x,
url(./images/ic_google_2x.png) 2x);
#lock-logo {
fill: var(--google-yellow-700);
}
#grey-banner {
......@@ -178,29 +154,37 @@
$i18n{syncConfirmationTitle}
</h1>
<div class="message-container">
<!-- Container needed to contain the icon in a green circle. -->
<div id="sync-logo-container" class="logo">
<iron-icon icon="cr:sync" class="logo"></iron-icon>
<iron-icon icon="cr:sync" id="sync-logo" class="logo"></iron-icon>
<div>
<div consent-description>$i18n{syncConfirmationSyncInfoTitle}</div>
<div class="secondary" consent-description>
$i18n{syncConfirmationSyncInfoDesc}
</div>
</div>
<div consent-description>$i18n{syncConfirmationChromeSyncBody}</div>
</div>
<div class="message-container">
<iron-icon icon="sync-confirmation:assistant" id="personalize-logo"
<iron-icon icon="sync-confirmation:spellcheck" id="spellcheck-logo"
class="logo">
</iron-icon>
<div>
<div consent-description>
$i18n{syncConfirmationPersonalizeServicesBody}
$i18n{syncConfirmationSpellcheckInfoTitle}
</div>
<div class="secondary" consent-description>
$i18n{syncConfirmationSpellcheckInfoDesc}
</div>
</div>
<div class="message-container">
<div id="googleg-logo" class="logo"></div>
<div consent-description>$i18n{syncConfirmationGoogleServicesBody}</div>
</div>
<div class="footer">
<div class="message-container">
<iron-icon icon="sync-confirmation:settings" class="logo"></iron-icon>
<iron-icon icon="sync-confirmation:lock" id="lock-logo" class="logo">
</iron-icon>
<div>
<div consent-description>
$i18n{syncConfirmationSyncSettingsDescription}
$i18n{syncConfirmationImproveChromeInfoTitle}
</div>
<div class="secondary" consent-description>
$i18n{syncConfirmationImproveChromeInfoDesc}
</div>
</div>
</div>
<div class="action-container">
......@@ -217,8 +201,6 @@
</paper-button>
</div>
</div>
</div>
</template>
<script src="sync_confirmation_app.js"></script>
</dom-module>
chrome/browser/ui/webui/signin/sync_confirmation_ui.cc
View file @ 6be7da76
......@@ -56,16 +56,19 @@ SyncConfirmationUI::SyncConfirmationUI(content::WebUI* web_ui)
source->AddResourcePath("sync_confirmation.js",
IDR_DICE_SYNC_CONFIRMATION_JS);
AddStringResource(source, "syncConfirmationChromeSyncBody",
IDS_SYNC_CONFIRMATION_DICE_CHROME_SYNC_MESSAGE);
AddStringResource(source, "syncConfirmationPersonalizeServicesBody",
IDS_SYNC_CONFIRMATION_DICE_PERSONALIZE_SERVICES_BODY);
AddStringResource(source, "syncConfirmationGoogleServicesBody",
IDS_SYNC_CONFIRMATION_DICE_GOOGLE_SERVICES_BODY);
AddStringResource(source, "syncConfirmationSyncSettingsLinkBody",
IDS_SYNC_CONFIRMATION_DICE_SYNC_SETTINGS_LINK_BODY);
AddStringResource(source, "syncConfirmationSyncSettingsDescription",
IDS_SYNC_CONFIRMATION_DICE_SYNC_SETTINGS_DESCRIPTION);
AddStringResource(source, "syncConfirmationSyncInfoTitle",
IDS_SYNC_CONFIRMATION_UNITY_SYNC_INFO_TITLE);
AddStringResource(source, "syncConfirmationSyncInfoDesc",
IDS_SYNC_CONFIRMATION_UNITY_SYNC_INFO_DESC);
AddStringResource(source, "syncConfirmationSpellcheckInfoTitle",
IDS_SYNC_CONFIRMATION_UNITY_SPELLCHECK_INFO_TITLE);
AddStringResource(source, "syncConfirmationSpellcheckInfoDesc",
IDS_SYNC_CONFIRMATION_UNITY_SPELLCHECK_INFO_DESC);
AddStringResource(source, "syncConfirmationImproveChromeInfoTitle",
IDS_SYNC_CONFIRMATION_UNITY_IMPROVE_CHROME_INFO_TITLE);
AddStringResource(source, "syncConfirmationImproveChromeInfoDesc",
IDS_SYNC_CONFIRMATION_UNITY_IMPROVE_CHROME_INFO_DESC);
AddStringResource(source, "syncConfirmationSettingsLabel",
IDS_SYNC_CONFIRMATION_DICE_SETTINGS_BUTTON_LABEL);
......
chrome/test/data/webui/signin/sync_confirmation_test.js
View file @ 6be7da76
......@@ -53,13 +53,13 @@ cr.define('signin_sync_confirmation', function() {
const STANDARD_CONSENT_DESCRIPTION_TEXT = [
'Get Google smarts in Chrome',
'Your bookmarks, passwords, history, and more on all your devices',
'More personal Google services, like better page suggestions',
'Improve Chrome and its security by sending system and usage ' +
'information to Google',
'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.'
'Sync your bookmarks, passwords, history, and more on all your devices',
'Google may use your history to personalize Search, ads, and other ' +
'Google services.',
'Fix spelling errors with enhanced spell check',
'The text you type in text fields will be sent to Google.',
'Help improve Chrome and its security',
'Anonymous system and usage data will be sent to Google.'
];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment