Commit 69f0b0d2 authored by Alexander Alekseev's avatar Alexander Alekseev Committed by Commit Bot

Chrome OS: Use Chrome logo on the OOBE Sync Sessings screen.


This CL limits Sync settings screen to Google Chrome build and adds Chrome logo
to it.

BUG=805507

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I5d17c32a7b9339af93394b366976d8ae43e13f03
Reviewed-on: https://chromium-review.googlesource.com/889916Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532221}
parent 902bffab
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
<include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
</if> </if>
<if expr="chromeos">
<include name="IDR_PRODUCT_LOGO_24PX_1X" file="google_chrome/chrome_24px_1x.svg" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_24PX_2X" file="google_chrome/chrome_24px_2x.svg" type="BINDATA" />
</if>
<if expr="is_win"> <if expr="is_win">
<!-- External company logo, displayed in the Chrome Cleanup WebUI if <!-- External company logo, displayed in the Chrome Cleanup WebUI if
cleanup functionality is powered by an external company. --> cleanup functionality is powered by an external company. -->
......
...@@ -581,6 +581,7 @@ void WizardController::ShowTermsOfServiceScreen() { ...@@ -581,6 +581,7 @@ void WizardController::ShowTermsOfServiceScreen() {
} }
void WizardController::ShowSyncConsentScreen() { void WizardController::ShowSyncConsentScreen() {
#if defined(GOOGLE_CHROME_BUILD)
const user_manager::UserManager* user_manager = const user_manager::UserManager* user_manager =
user_manager::UserManager::Get(); user_manager::UserManager::Get();
// Skip for non-regular users. // Skip for non-regular users.
...@@ -594,6 +595,9 @@ void WizardController::ShowSyncConsentScreen() { ...@@ -594,6 +595,9 @@ void WizardController::ShowSyncConsentScreen() {
VLOG(1) << "Showing Sync Consent screen."; VLOG(1) << "Showing Sync Consent screen.";
UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_SYNC_CONSENT); UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_SYNC_CONSENT);
SetCurrentScreen(GetScreen(OobeScreen::SCREEN_SYNC_CONSENT)); SetCurrentScreen(GetScreen(OobeScreen::SCREEN_SYNC_CONSENT));
#else
ShowArcTermsOfServiceScreen();
#endif
} }
void WizardController::ShowArcTermsOfServiceScreen() { void WizardController::ShowArcTermsOfServiceScreen() {
......
...@@ -53,9 +53,10 @@ ...@@ -53,9 +53,10 @@
</div> </div>
<div class="footer layout vertical"> <div class="footer layout vertical">
<div class="overview-list-item flex layout horizontal center"> <div class="overview-list-item flex layout horizontal center">
<hd-iron-icon class="overview-list-item-icon" <img srcset="chrome://oobe/logo_24px-1x.svg 1x,
icon1x="sync-consent-32:googleg" icon2x="sync-consent-64:googleg"> chrome://oobe/logo_24px-2x.svg 2x"
</hd-iron-icon> class="overview-list-item-icon">
</img>
<div class="overview-list-item-text flex layout vertical <div class="overview-list-item-text flex layout vertical
center-justified"> center-justified">
<div class="overview-list-item-title"> <div class="overview-list-item-title">
......
...@@ -120,6 +120,11 @@ const char kArcPlaystoreJSPath[] = "playstore.js"; ...@@ -120,6 +120,11 @@ const char kArcPlaystoreJSPath[] = "playstore.js";
const char kArcPlaystoreLogoPath[] = "playstore.svg"; const char kArcPlaystoreLogoPath[] = "playstore.svg";
const char kProductLogoPath[] = "product-logo.png"; const char kProductLogoPath[] = "product-logo.png";
#if defined(GOOGLE_CHROME_BUILD)
const char kLogo24PX1XSvgPath[] = "logo_24px-1x.svg";
const char kLogo24PX2XSvgPath[] = "logo_24px-2x.svg";
#endif
// Creates a WebUIDataSource for chrome://oobe // Creates a WebUIDataSource for chrome://oobe
content::WebUIDataSource* CreateOobeUIDataSource( content::WebUIDataSource* CreateOobeUIDataSource(
const base::DictionaryValue& localized_strings, const base::DictionaryValue& localized_strings,
...@@ -177,6 +182,11 @@ content::WebUIDataSource* CreateOobeUIDataSource( ...@@ -177,6 +182,11 @@ content::WebUIDataSource* CreateOobeUIDataSource(
source->AddResourcePath(kCustomElementsUserPodHTMLPath, source->AddResourcePath(kCustomElementsUserPodHTMLPath,
IDR_CUSTOM_ELEMENTS_USER_POD_HTML); IDR_CUSTOM_ELEMENTS_USER_POD_HTML);
} }
#if defined(GOOGLE_CHROME_BUILD)
source->AddResourcePath(kLogo24PX1XSvgPath, IDR_PRODUCT_LOGO_24PX_1X);
source->AddResourcePath(kLogo24PX2XSvgPath, IDR_PRODUCT_LOGO_24PX_2X);
// No #else section here as Sync Settings screen is Chrome-specific.
#endif
// Required for postprocessing of Goolge PlayStore Terms. // Required for postprocessing of Goolge PlayStore Terms.
source->AddResourcePath(kArcPlaystoreCSSPath, IDR_ARC_SUPPORT_PLAYSTORE_CSS); source->AddResourcePath(kArcPlaystoreCSSPath, IDR_ARC_SUPPORT_PLAYSTORE_CSS);
......
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