diff options
author | bobbypowers@gmail.com <bobbypowers@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 17:48:49 +0000 |
---|---|---|
committer | bobbypowers@gmail.com <bobbypowers@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 17:48:49 +0000 |
commit | cc1a246af159412534284ac32773a4909db63c21 (patch) | |
tree | 4cf540d9465e05ada27dad181f719767d669630d /ui/native_theme/common_theme.cc | |
parent | c92f932d557e0d8221ddcd37010bfe0fd04dfe14 (diff) | |
download | chromium_src-cc1a246af159412534284ac32773a4909db63c21.zip chromium_src-cc1a246af159412534284ac32773a4909db63c21.tar.gz chromium_src-cc1a246af159412534284ac32773a4909db63c21.tar.bz2 |
wrench_menu: use NativeTheme colors under aura
This changes the wrench menu's MenuButtonBackground to use NativeTheme colors under aura, and introduces kColorId_HotMenuItemBackgroundColor.
BUG=130810
Review URL: https://chromiumcodereview.appspot.com/12483006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/native_theme/common_theme.cc')
-rw-r--r-- | ui/native_theme/common_theme.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc index 90e4db5..6e38094 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 kEnabledMenuButtonBorderColor = SkColorSetARGB(36, 0, 0, 0); +const SkColor kFocusedMenuButtonBorderColor = SkColorSetARGB(72, 0, 0, 0); +const SkColor kHoverMenuButtonBorderColor = 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_EnabledMenuButtonBorderColor: + *color = kEnabledMenuButtonBorderColor; + break; + case NativeTheme::kColorId_FocusedMenuButtonBorderColor: + *color = kFocusedMenuButtonBorderColor; + break; + case NativeTheme::kColorId_HoverMenuButtonBorderColor: + *color = kHoverMenuButtonBorderColor; + 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; |