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

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

Issue 235833002: [Mac] Redesign the avatar bubble UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unittest broken by rebase Created 6 years, 8 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
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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 case kColorId_ButtonBackgroundColor: 223 case kColorId_ButtonBackgroundColor:
224 return GetButtonStyle()->bg[GTK_STATE_NORMAL]; 224 return GetButtonStyle()->bg[GTK_STATE_NORMAL];
225 case kColorId_ButtonEnabledColor: 225 case kColorId_ButtonEnabledColor:
226 return GetButtonStyle()->text[GTK_STATE_NORMAL]; 226 return GetButtonStyle()->text[GTK_STATE_NORMAL];
227 case kColorId_ButtonDisabledColor: 227 case kColorId_ButtonDisabledColor:
228 return GetButtonStyle()->text[GTK_STATE_INSENSITIVE]; 228 return GetButtonStyle()->text[GTK_STATE_INSENSITIVE];
229 case kColorId_ButtonHighlightColor: 229 case kColorId_ButtonHighlightColor:
230 return GetButtonStyle()->base[GTK_STATE_SELECTED]; 230 return GetButtonStyle()->base[GTK_STATE_SELECTED];
231 case kColorId_ButtonHoverColor: 231 case kColorId_ButtonHoverColor:
232 return GetButtonStyle()->text[GTK_STATE_PRELIGHT]; 232 return GetButtonStyle()->text[GTK_STATE_PRELIGHT];
233 case kColorId_ButtonHoverBackgroundColor:
234 return GetButtonStyle()->bg[GTK_STATE_PRELIGHT];
233 235
234 // Textfield 236 // Textfield
235 case kColorId_TextfieldDefaultColor: 237 case kColorId_TextfieldDefaultColor:
236 return GetEntryStyle()->text[GTK_STATE_NORMAL]; 238 return GetEntryStyle()->text[GTK_STATE_NORMAL];
237 case kColorId_TextfieldDefaultBackground: 239 case kColorId_TextfieldDefaultBackground:
238 return GetEntryStyle()->base[GTK_STATE_NORMAL]; 240 return GetEntryStyle()->base[GTK_STATE_NORMAL];
239 case kColorId_TextfieldReadOnlyColor: 241 case kColorId_TextfieldReadOnlyColor:
240 return GetEntryStyle()->text[GTK_STATE_INSENSITIVE]; 242 return GetEntryStyle()->text[GTK_STATE_INSENSITIVE];
241 case kColorId_TextfieldReadOnlyBackground: 243 case kColorId_TextfieldReadOnlyBackground:
242 return GetEntryStyle()->base[GTK_STATE_INSENSITIVE]; 244 return GetEntryStyle()->base[GTK_STATE_INSENSITIVE];
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 fake_menu_.Own(gtk_custom_menu_new()); 388 fake_menu_.Own(gtk_custom_menu_new());
387 389
388 fake_menu_item_ = gtk_custom_menu_item_new(); 390 fake_menu_item_ = gtk_custom_menu_item_new();
389 gtk_menu_shell_append(GTK_MENU_SHELL(fake_menu_.get()), fake_menu_item_); 391 gtk_menu_shell_append(GTK_MENU_SHELL(fake_menu_.get()), fake_menu_item_);
390 } 392 }
391 393
392 return gtk_rc_get_style(fake_menu_item_); 394 return gtk_rc_get_style(fake_menu_item_);
393 } 395 }
394 396
395 } // namespace libgtk2ui 397 } // namespace libgtk2ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698