Commit 1f7126db authored by Joe DeBlasio's avatar Joe DeBlasio Committed by Commit Bot

Update Safety Tip banner to support darkmode.

This CL adds dark mode detection and images for the Safety Tip banner.

Bug: 1013401
Change-Id: I1be3f117fcc87f84b0add44610f5776fddc1431c
TBR: oshima@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866855Reviewed-by: default avatarJoe DeBlasio <jdeblasio@chromium.org>
Commit-Queue: Joe DeBlasio <jdeblasio@chromium.org>
Auto-Submit: Joe DeBlasio <jdeblasio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707162}
parent 5a1c9fc9
...@@ -252,8 +252,10 @@ ...@@ -252,8 +252,10 @@
</if> </if>
<structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file="common/restore_button_mask.png" /> <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file="common/restore_button_mask.png" />
<if expr="not is_android"> <if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_SAFETY_TIP_LOOKALIKE_ILLUSTRATION" file="common/safety_tip_lookalike_illustration.png" /> <structure type="chrome_scaled_image" name="IDR_SAFETY_TIP_LOOKALIKE_ILLUSTRATION_DARK" file="common/safety_tip_lookalike_illustration_dark.png" />
<structure type="chrome_scaled_image" name="IDR_SAFETY_TIP_SUSPICIOUS_ILLUSTRATION" file="common/safety_tip_suspicious_illustration.png" /> <structure type="chrome_scaled_image" name="IDR_SAFETY_TIP_LOOKALIKE_ILLUSTRATION_LIGHT" file="common/safety_tip_lookalike_illustration_light.png" />
<structure type="chrome_scaled_image" name="IDR_SAFETY_TIP_SUSPICIOUS_ILLUSTRATION_DARK" file="common/safety_tip_suspicious_illustration_dark.png" />
<structure type="chrome_scaled_image" name="IDR_SAFETY_TIP_SUSPICIOUS_ILLUSTRATION_LIGHT" file="common/safety_tip_suspicious_illustration_light.png" />
<structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD1" file="common/save_password1.png" /> <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD1" file="common/save_password1.png" />
<structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD1_DARK" file="common/save_password1_dark.png" /> <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD1_DARK" file="common/save_password1_dark.png" />
<structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD2" file="common/save_password2.png" /> <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD2" file="common/save_password2.png" />
......
...@@ -35,18 +35,35 @@ using security_state::SafetyTipStatus; ...@@ -35,18 +35,35 @@ using security_state::SafetyTipStatus;
namespace { namespace {
int GetSafetyTipBannerId(security_state::SafetyTipStatus safety_tip_status) { int GetSafetyTipBannerId(security_state::SafetyTipStatus safety_tip_status) {
switch (safety_tip_status) { const ui::NativeTheme* native_theme =
case security_state::SafetyTipStatus::kBadReputation: ui::NativeTheme::GetInstanceForNativeUi();
return IDR_SAFETY_TIP_SUSPICIOUS_ILLUSTRATION; bool is_dark = native_theme && native_theme->ShouldUseDarkColors();
case security_state::SafetyTipStatus::kLookalike:
return IDR_SAFETY_TIP_LOOKALIKE_ILLUSTRATION; if (is_dark) {
case security_state::SafetyTipStatus::kBadKeyword: switch (safety_tip_status) {
case security_state::SafetyTipStatus::kUnknown: case security_state::SafetyTipStatus::kBadReputation:
case security_state::SafetyTipStatus::kNone: return IDR_SAFETY_TIP_SUSPICIOUS_ILLUSTRATION_DARK;
NOTREACHED(); case security_state::SafetyTipStatus::kLookalike:
return IDR_SAFETY_TIP_LOOKALIKE_ILLUSTRATION_DARK;
case security_state::SafetyTipStatus::kBadKeyword:
case security_state::SafetyTipStatus::kUnknown:
case security_state::SafetyTipStatus::kNone:
NOTREACHED();
}
} else {
switch (safety_tip_status) {
case security_state::SafetyTipStatus::kBadReputation:
return IDR_SAFETY_TIP_SUSPICIOUS_ILLUSTRATION_LIGHT;
case security_state::SafetyTipStatus::kLookalike:
return IDR_SAFETY_TIP_LOOKALIKE_ILLUSTRATION_LIGHT;
case security_state::SafetyTipStatus::kBadKeyword:
case security_state::SafetyTipStatus::kUnknown:
case security_state::SafetyTipStatus::kNone:
NOTREACHED();
}
} }
NOTREACHED(); NOTREACHED();
return IDR_SAFETY_TIP_SUSPICIOUS_ILLUSTRATION; return IDR_SAFETY_TIP_SUSPICIOUS_ILLUSTRATION_LIGHT;
} }
} // namespace } // namespace
......
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