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

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

Issue 2961223002: Rename native theme color constants relating to text on dialog buttons
Patch Set: rebase Created 3 years, 5 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 | chrome/browser/ui/libgtkui/native_theme_gtk3.cc » ('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/libgtkui/native_theme_gtk2.h" 5 #include "chrome/browser/ui/libgtkui/native_theme_gtk2.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h" 9 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
10 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h" 10 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 return SkColorSetRGB(0x00, 0x00, 0xEE); 189 return SkColorSetRGB(0x00, 0x00, 0xEE);
190 } 190 }
191 case kColorId_LinkPressed: 191 case kColorId_LinkPressed:
192 return SK_ColorRED; 192 return SK_ColorRED;
193 193
194 // Separator 194 // Separator
195 case kColorId_SeparatorColor: 195 case kColorId_SeparatorColor:
196 return GetFgColor(GetSeparator(), INSENSITIVE); 196 return GetFgColor(GetSeparator(), INSENSITIVE);
197 197
198 // Button 198 // Button
199 case kColorId_ButtonEnabledColor: 199 case kColorId_TextOnEnabledDialogButton:
200 return GetTextColor(GetButton(), NORMAL); 200 return GetTextColor(GetButton(), NORMAL);
201 case kColorId_BlueButtonEnabledColor: 201 case kColorId_BlueButtonEnabledColor:
202 return GetTextColor(GetBlueButton(), NORMAL); 202 return GetTextColor(GetBlueButton(), NORMAL);
203 case kColorId_ButtonDisabledColor: 203 case kColorId_TextOnDisabledDialogButton:
204 return GetTextColor(GetButton(), INSENSITIVE); 204 return GetTextColor(GetButton(), INSENSITIVE);
205 case kColorId_BlueButtonDisabledColor: 205 case kColorId_BlueButtonDisabledColor:
206 return GetTextColor(GetBlueButton(), INSENSITIVE); 206 return GetTextColor(GetBlueButton(), INSENSITIVE);
207 case kColorId_ButtonHoverColor: 207 case kColorId_ButtonHoverColor:
208 return GetTextColor(GetButton(), PRELIGHT); 208 return GetTextColor(GetButton(), PRELIGHT);
209 case kColorId_BlueButtonHoverColor: 209 case kColorId_BlueButtonHoverColor:
210 return GetTextColor(GetBlueButton(), PRELIGHT); 210 return GetTextColor(GetBlueButton(), PRELIGHT);
211 case kColorId_BlueButtonPressedColor: 211 case kColorId_BlueButtonPressedColor:
212 return GetTextColor(GetBlueButton(), ACTIVE); 212 return GetTextColor(GetBlueButton(), ACTIVE);
213 case kColorId_BlueButtonShadowColor: 213 case kColorId_BlueButtonShadowColor:
214 return SK_ColorTRANSPARENT; 214 return SK_ColorTRANSPARENT;
215 case kColorId_ProminentButtonColor: 215 case kColorId_ProminentButtonColor:
216 return GetSystemColor(kColorId_LinkEnabled); 216 return GetSystemColor(kColorId_LinkEnabled);
217 case kColorId_TextOnProminentButtonColor: 217 case kColorId_TextOnProminentDialogButton:
218 return GetTextColor(GetLabel(), SELECTED); 218 return GetTextColor(GetLabel(), SELECTED);
219 case kColorId_ButtonPressedShade: 219 case kColorId_ButtonPressedShade:
220 return SK_ColorTRANSPARENT; 220 return SK_ColorTRANSPARENT;
221 221
222 // Textfield 222 // Textfield
223 case kColorId_TextfieldDefaultColor: 223 case kColorId_TextfieldDefaultColor:
224 return GetTextColor(GetEntry(), NORMAL); 224 return GetTextColor(GetEntry(), NORMAL);
225 case kColorId_TextfieldDefaultBackground: 225 case kColorId_TextfieldDefaultBackground:
226 return GetBaseColor(GetEntry(), NORMAL); 226 return GetBaseColor(GetEntry(), NORMAL);
227 227
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 GtkWidget* NativeThemeGtk2::GetSeparator() const { 454 GtkWidget* NativeThemeGtk2::GetSeparator() const {
455 static GtkWidget* fake_separator = nullptr; 455 static GtkWidget* fake_separator = nullptr;
456 456
457 if (!fake_separator) 457 if (!fake_separator)
458 fake_separator = gtk_hseparator_new(); 458 fake_separator = gtk_hseparator_new();
459 459
460 return fake_separator; 460 return fake_separator;
461 } 461 }
462 462
463 } // namespace libgtkui 463 } // namespace libgtkui
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/libgtkui/native_theme_gtk3.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698