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

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

Issue 2319313003: views: refactor away PlatformStyle::BackgroundColorForMdButton (Closed)
Patch Set: nits and rename Created 4 years, 3 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
« no previous file with comments | « no previous file | ui/gfx/color_utils.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_frame.h" 9 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h"
10 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h" 10 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_menu_subclasses.h"
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 return GetBGColor(GetButton(), PRELIGHT); 322 return GetBGColor(GetButton(), PRELIGHT);
323 case kColorId_BlueButtonPressedColor: 323 case kColorId_BlueButtonPressedColor:
324 return GetTextColor(GetBlueButton(), ACTIVE); 324 return GetTextColor(GetBlueButton(), ACTIVE);
325 case kColorId_BlueButtonShadowColor: 325 case kColorId_BlueButtonShadowColor:
326 return SK_ColorTRANSPARENT; 326 return SK_ColorTRANSPARENT;
327 // return GetTextColor(GetButton(), NORMAL); 327 // return GetTextColor(GetButton(), NORMAL);
328 case kColorId_CallToActionColor: 328 case kColorId_CallToActionColor:
329 return GetSystemColor(kColorId_LinkEnabled); 329 return GetSystemColor(kColorId_LinkEnabled);
330 case kColorId_TextOnCallToActionColor: 330 case kColorId_TextOnCallToActionColor:
331 return GetTextColor(GetLabel(), SELECTED); 331 return GetTextColor(GetLabel(), SELECTED);
332 case kColorId_ButtonPressedShade:
333 return SK_ColorTRANSPARENT;
332 334
333 // Textfield 335 // Textfield
334 case kColorId_TextfieldDefaultColor: 336 case kColorId_TextfieldDefaultColor:
335 return GetTextColor(GetEntry(), NORMAL); 337 return GetTextColor(GetEntry(), NORMAL);
336 case kColorId_TextfieldDefaultBackground: 338 case kColorId_TextfieldDefaultBackground:
337 return GetBaseColor(GetEntry(), NORMAL); 339 return GetBaseColor(GetEntry(), NORMAL);
338 340
339 #if GTK_MAJOR_VERSION == 2 341 #if GTK_MAJOR_VERSION == 2
340 case kColorId_TextfieldReadOnlyColor: 342 case kColorId_TextfieldReadOnlyColor:
341 return GetTextColor(GetEntry(), ACTIVE); 343 return GetTextColor(GetEntry(), ACTIVE);
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 584
583 if (!fake_menu_item) { 585 if (!fake_menu_item) {
584 fake_menu_item = gtk_custom_menu_item_new(); 586 fake_menu_item = gtk_custom_menu_item_new();
585 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item); 587 gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item);
586 } 588 }
587 589
588 return fake_menu_item; 590 return fake_menu_item;
589 } 591 }
590 592
591 } // namespace libgtk2ui 593 } // namespace libgtk2ui
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/color_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698