Commit 75395842 authored by Owen Min's avatar Owen Min Committed by Commit Bot

Make enterprise startup dialog use new logo in dark mode.

Before:
https://drive.google.com/file/d/1MZ4wt7LW68CK-KqzLKgLKuZNNUBcrS59/view?usp=sharing
After:
https://drive.google.com/file/d/1uyUPqdoWE69pp18Q811GsY1JSxSBHMN3/view?usp=sharing

Bug: 990406
Change-Id: I674fa16a398f376bafd240bbc54e92786cd2372e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1742522Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Reviewed-by: default avatarPeter Boström <pbos@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691661}
parent 7cd14fa5
......@@ -179,6 +179,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE" file="google_chrome/product_logo_enterprise.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="google_chrome/product_logo_enterprise_white.png" />
</if>
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="common/profile_avatar_generic.png" />
......
......@@ -178,9 +178,12 @@ std::unique_ptr<views::View> EnterpriseStartupDialogView::CreateExtraView() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Show Google Chrome Enterprise logo only for official build.
auto logo_image = std::make_unique<views::ImageView>();
logo_image->SetImage(ui::ResourceBundle::GetSharedInstance()
.GetImageNamed(IDR_PRODUCT_LOGO_ENTERPRISE)
.AsImageSkia());
logo_image->SetImage(
ui::ResourceBundle::GetSharedInstance()
.GetImageNamed((logo_image->GetNativeTheme()->ShouldUseDarkColors())
? IDR_PRODUCT_LOGO_ENTERPRISE_WHITE
: IDR_PRODUCT_LOGO_ENTERPRISE)
.AsImageSkia());
logo_image->set_tooltip_text(
l10n_util::GetStringUTF16(IDS_PRODUCT_LOGO_ENTERPRISE_ALT_TEXT));
gfx::Rect logo_bounds = logo_image->GetImageBounds();
......
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