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

Side by Side Diff: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc

Issue 205153003: linux_aura: Don't inject black in WrenchMenu::GetForegroundColor(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sky rename request Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/wrench_menu.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h" 5 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h" 9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h"
10 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" 10 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 return GetWindowStyle()->bg[GTK_STATE_NORMAL]; 111 return GetWindowStyle()->bg[GTK_STATE_NORMAL];
112 112
113 // FocusableBorder 113 // FocusableBorder
114 case kColorId_FocusedBorderColor: 114 case kColorId_FocusedBorderColor:
115 return GetEntryStyle()->bg[GTK_STATE_SELECTED]; 115 return GetEntryStyle()->bg[GTK_STATE_SELECTED];
116 case kColorId_UnfocusedBorderColor: 116 case kColorId_UnfocusedBorderColor:
117 return GetEntryStyle()->text_aa[GTK_STATE_NORMAL]; 117 return GetEntryStyle()->text_aa[GTK_STATE_NORMAL];
118 118
119 // MenuItem 119 // MenuItem
120 case kColorId_EnabledMenuItemForegroundColor: 120 case kColorId_EnabledMenuItemForegroundColor:
121 case kColorId_DisabledEmphasizedMenuItemForegroundColor:
121 return GetMenuItemStyle()->text[GTK_STATE_NORMAL]; 122 return GetMenuItemStyle()->text[GTK_STATE_NORMAL];
122 case kColorId_DisabledMenuItemForegroundColor: 123 case kColorId_DisabledMenuItemForegroundColor:
123 return GetMenuItemStyle()->text[GTK_STATE_INSENSITIVE]; 124 return GetMenuItemStyle()->text[GTK_STATE_INSENSITIVE];
124 case kColorId_SelectedMenuItemForegroundColor: 125 case kColorId_SelectedMenuItemForegroundColor:
125 return GetMenuItemStyle()->text[GTK_STATE_SELECTED]; 126 return GetMenuItemStyle()->text[GTK_STATE_SELECTED];
126 case kColorId_FocusedMenuItemBackgroundColor: 127 case kColorId_FocusedMenuItemBackgroundColor:
127 return GetMenuItemStyle()->bg[GTK_STATE_SELECTED]; 128 return GetMenuItemStyle()->bg[GTK_STATE_SELECTED];
128 case kColorId_HoverMenuItemBackgroundColor: 129 case kColorId_HoverMenuItemBackgroundColor:
129 return GetMenuItemStyle()->bg[GTK_STATE_PRELIGHT]; 130 return GetMenuItemStyle()->bg[GTK_STATE_PRELIGHT];
130 case kColorId_FocusedMenuButtonBorderColor: 131 case kColorId_FocusedMenuButtonBorderColor:
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 fake_menu_.Own(gtk_custom_menu_new()); 262 fake_menu_.Own(gtk_custom_menu_new());
262 263
263 fake_menu_item_ = gtk_custom_menu_item_new(); 264 fake_menu_item_ = gtk_custom_menu_item_new();
264 gtk_menu_shell_append(GTK_MENU_SHELL(fake_menu_.get()), fake_menu_item_); 265 gtk_menu_shell_append(GTK_MENU_SHELL(fake_menu_.get()), fake_menu_item_);
265 } 266 }
266 267
267 return gtk_rc_get_style(fake_menu_item_); 268 return gtk_rc_get_style(fake_menu_item_);
268 } 269 }
269 270
270 } // namespace libgtk2ui 271 } // namespace libgtk2ui
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/wrench_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698