From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/native_theme/native_theme.cc | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'chromium/ui/native_theme/native_theme.cc') diff --git a/chromium/ui/native_theme/native_theme.cc b/chromium/ui/native_theme/native_theme.cc index 1d9716fc421..150f4455d49 100644 --- a/chromium/ui/native_theme/native_theme.cc +++ b/chromium/ui/native_theme/native_theme.cc @@ -254,20 +254,13 @@ bool NativeTheme::UsesHighContrastColors() const { return is_high_contrast_; } -NativeTheme::HighContrastColorScheme NativeTheme::GetHighContrastColorScheme() - const { - if (!UsesHighContrastColors()) - return NativeTheme::HighContrastColorScheme::kNone; - switch (GetPreferredColorScheme()) { - case NativeTheme::PreferredColorScheme::kDark: - return HighContrastColorScheme::kDark; - case NativeTheme::PreferredColorScheme::kLight: - return HighContrastColorScheme::kLight; - case NativeTheme::PreferredColorScheme::kNoPreference: - return NativeTheme::HighContrastColorScheme::kCustom; - } - NOTREACHED(); - return NativeTheme::HighContrastColorScheme::kNone; +NativeTheme::PlatformHighContrastColorScheme +NativeTheme::GetPlatformHighContrastColorScheme() const { + if (GetDefaultSystemColorScheme() != ColorScheme::kPlatformHighContrast) + return PlatformHighContrastColorScheme::kNone; + return (GetPreferredColorScheme() == PreferredColorScheme::kDark) + ? PlatformHighContrastColorScheme::kDark + : PlatformHighContrastColorScheme::kLight; } NativeTheme::PreferredColorScheme NativeTheme::GetPreferredColorScheme() const { -- cgit v1.2.1