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

Unified Diff: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc

Issue 12483006: wrench_menu: use NativeTheme colors under aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows build 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/wrench_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
diff --git a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
index 6fbe3c268d68b0dbb57e45ae1ec56b0d88ef4163..770343ff7fbec9b208598e799faf728c1d011c5e 100644
--- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
@@ -146,7 +146,14 @@ GdkColor NativeThemeGtk2::GetSystemGdkColor(ColorId color_id) const {
// will require careful threading through existing menu code though.
case kColorId_FocusedMenuItemBackgroundColor:
return GetMenuItemStyle()->bg[GTK_STATE_SELECTED];
+ case kColorId_HoverMenuItemBackgroundColor:
+ return GetMenuItemStyle()->bg[GTK_STATE_PRELIGHT];
+ case kColorId_FocusedMenuButtonBorderColor:
+ return GetEntryStyle()->bg[GTK_STATE_NORMAL];
+ case kColorId_HoverMenuButtonBorderColor:
+ return GetEntryStyle()->text_aa[GTK_STATE_PRELIGHT];
case kColorId_MenuBorderColor:
+ case kColorId_EnabledMenuButtonBorderColor:
case kColorId_MenuSeparatorColor: {
return GetMenuItemStyle()->text[GTK_STATE_INSENSITIVE];
}
@@ -171,7 +178,7 @@ GdkColor NativeThemeGtk2::GetSystemGdkColor(ColorId color_id) const {
case kColorId_TextButtonHighlightColor:
return GetButtonStyle()->base[GTK_STATE_SELECTED];
case kColorId_TextButtonHoverColor:
- return GetButtonStyle()->text[GTK_STATE_NORMAL];
+ return GetButtonStyle()->text[GTK_STATE_PRELIGHT];
// Textfield
case kColorId_TextfieldDefaultColor:
« no previous file with comments | « no previous file | chrome/browser/ui/views/wrench_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698