Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Unified Diff: ui/native_theme/common_theme.cc

Issue 12483006: wrench_menu: use NativeTheme colors under aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unused constant in common_theme.cc Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/native_theme/common_theme.cc
diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
index 90e4db5ab9be6984be894752ec6cb8d82a22db49..bf70c5bc2cdddc3905276e674c80aec127ed30c0 100644
--- a/ui/native_theme/common_theme.cc
+++ b/ui/native_theme/common_theme.cc
@@ -25,9 +25,14 @@ const SkColor kMenuHighlightBackgroundColor = SkColorSetA(SK_ColorBLACK, 15);
const SkColor kMenuInvertedSchemeHighlightBackgroundColor =
SkColorSetRGB(48, 48, 48);
const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA);
+const SkColor kEnabledMenuItemBorderColor = SkColorSetARGB(36, 0, 0, 0);
+const SkColor kFocusedMenuItemBorderColor = SkColorSetARGB(72, 0, 0, 0);
+const SkColor kHoverMenuItemBorderColor = SkColorSetARGB(72, 0, 0, 0);
const SkColor kMenuSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9);
const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK;
const SkColor kDisabledMenuItemForegroundColor = SkColorSetRGB(161, 161, 146);
+const SkColor kHoverMenuItemBackgroundColor =
+ SkColorSetARGB(204, 255, 255, 255);
} // namespace
@@ -39,6 +44,15 @@ bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) {
case NativeTheme::kColorId_MenuBorderColor:
*color = kMenuBorderColor;
break;
+ case NativeTheme::kColorId_EnabledMenuItemBorderColor:
+ *color = kEnabledMenuItemBorderColor;
+ break;
+ case NativeTheme::kColorId_FocusedMenuItemBorderColor:
+ *color = kFocusedMenuItemBorderColor;
+ break;
+ case NativeTheme::kColorId_HoverMenuItemBorderColor:
+ *color = kHoverMenuItemBorderColor;
+ break;
case NativeTheme::kColorId_MenuSeparatorColor:
*color = kMenuSeparatorColor;
break;
@@ -48,6 +62,9 @@ bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) {
case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
*color = kMenuHighlightBackgroundColor;
break;
+ case NativeTheme::kColorId_HoverMenuItemBackgroundColor:
+ *color = kHoverMenuItemBackgroundColor;
+ break;
case NativeTheme::kColorId_EnabledMenuItemForegroundColor:
*color = kEnabledMenuItemForegroundColor;
break;

Powered by Google App Engine
This is Rietveld 408576698