Commit 834ad076 authored by Kinuko Yasuda's avatar Kinuko Yasuda Committed by Commit Bot

Jumbo build fix: tentative fix for https://crrev.com/c/1842316

Adding a prefix tentatively, which is probably a bad fix

TBR=bdea@chromium.org

Change-Id: Ic9614606fbf8a96bdd8229ab7c842e5e16907f21
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1851630Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarBettina Dea <bdea@chromium.org>
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704528}
parent 7cf54149
...@@ -29,37 +29,38 @@ using views::BoxLayout; ...@@ -29,37 +29,38 @@ using views::BoxLayout;
namespace { namespace {
// Fixed height of the illustration shown on the top of the dialog. // Fixed height of the illustration shown on the top of the dialog.
constexpr int kIllustrationHeight = 120; constexpr int kSafeBrowsingIllustrationHeight = 120;
// Fixed background color of the illustration shown on the top of the dialog in // Fixed background color of the illustration shown on the top of the dialog in
// normal mode. // normal mode.
constexpr SkColor kPictureBackgroundColor = SkColorSetARGB(0x0A, 0, 0, 0); constexpr SkColor kSafeBrowsingPictureBackgroundColor =
SkColorSetARGB(0x0A, 0, 0, 0);
// Fixed background color of the illustration shown on the top of the dialog in // Fixed background color of the illustration shown on the top of the dialog in
// dark mode. // dark mode.
constexpr SkColor kPictureBackgroundColorDarkMode = constexpr SkColor kSafeBrowsingPictureBackgroundColorDarkMode =
SkColorSetARGB(0x1A, 0x00, 0x00, 0x00); SkColorSetARGB(0x1A, 0x00, 0x00, 0x00);
// Updates the image displayed on the illustration based on the current theme. // Updates the image displayed on the illustration based on the current theme.
void UpdateImageView(NonAccessibleImageView* image_view, void SafeBrowsingUpdateImageView(NonAccessibleImageView* image_view,
bool dark_mode_enabled) { bool dark_mode_enabled) {
image_view->SetImage( image_view->SetImage(gfx::CreateVectorIcon(
gfx::CreateVectorIcon(dark_mode_enabled ? kPasswordCheckWarningDarkIcon dark_mode_enabled ? kPasswordCheckWarningDarkIcon
: kPasswordCheckWarningIcon, : kPasswordCheckWarningIcon,
dark_mode_enabled ? kPictureBackgroundColorDarkMode dark_mode_enabled ? kSafeBrowsingPictureBackgroundColorDarkMode
: kPictureBackgroundColor)); : kSafeBrowsingPictureBackgroundColor));
} }
// Creates the illustration which is rendered on top of the dialog. // Creates the illustration which is rendered on top of the dialog.
std::unique_ptr<NonAccessibleImageView> CreateIllustration( std::unique_ptr<NonAccessibleImageView> SafeBrowsingCreateIllustration(
bool dark_mode_enabled) { bool dark_mode_enabled) {
const gfx::Size illustration_size( const gfx::Size illustration_size(
ChromeLayoutProvider::Get()->GetDistanceMetric( ChromeLayoutProvider::Get()->GetDistanceMetric(
DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH), DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH),
kIllustrationHeight); kSafeBrowsingIllustrationHeight);
auto image_view = std::make_unique<NonAccessibleImageView>(); auto image_view = std::make_unique<NonAccessibleImageView>();
image_view->SetPreferredSize(illustration_size); image_view->SetPreferredSize(illustration_size);
UpdateImageView(image_view.get(), dark_mode_enabled); SafeBrowsingUpdateImageView(image_view.get(), dark_mode_enabled);
image_view->SetSize(illustration_size); image_view->SetSize(illustration_size);
image_view->SetVerticalAlignment(views::ImageView::Alignment::kLeading); image_view->SetVerticalAlignment(views::ImageView::Alignment::kLeading);
return image_view; return image_view;
...@@ -152,7 +153,7 @@ void PasswordReuseModalWarningDialog:: ...@@ -152,7 +153,7 @@ void PasswordReuseModalWarningDialog::
views::BoxLayout::Orientation::kVertical, gfx::Insets(), views::BoxLayout::Orientation::kVertical, gfx::Insets(),
0 /* between_child_spacing */)); 0 /* between_child_spacing */));
std::unique_ptr<NonAccessibleImageView> illustration = std::unique_ptr<NonAccessibleImageView> illustration =
CreateIllustration(GetNativeTheme()->ShouldUseDarkColors()); SafeBrowsingCreateIllustration(GetNativeTheme()->ShouldUseDarkColors());
std::unique_ptr<views::View> content = SetupContent( std::unique_ptr<views::View> content = SetupContent(
l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_SUMMARY)); l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_SUMMARY));
content->AddChildView(std::move(message_body_label)); content->AddChildView(std::move(message_body_label));
......
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