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

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

Issue 2610883004: Gtk3: Rename Gtk2UI and Get[FB]GColor (Closed)
Patch Set: Rebase Created 3 years, 11 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 | « chrome/browser/ui/libgtkui/gtk_util.cc ('k') | chrome/browser/ui/libgtkui/native_theme_gtk3.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtkui/native_theme_gtk2.cc
diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk2.cc b/chrome/browser/ui/libgtkui/native_theme_gtk2.cc
index 2657a10e152c324fc7a0c8e2568ccc980b6a6d9c..b734c1c873d877882a1366c38e5fb47bb089ead0 100644
--- a/chrome/browser/ui/libgtkui/native_theme_gtk2.cc
+++ b/chrome/browser/ui/libgtkui/native_theme_gtk2.cc
@@ -40,10 +40,10 @@ const GtkStateType stateMap[] = {
GTK_STATE_SELECTED, GTK_STATE_INSENSITIVE,
};
-SkColor GetFGColor(GtkWidget* widget, WidgetState state) {
+SkColor GetFgColor(GtkWidget* widget, WidgetState state) {
return GdkColorToSkColor(gtk_rc_get_style(widget)->fg[stateMap[state]]);
}
-SkColor GetBGColor(GtkWidget* widget, WidgetState state) {
+SkColor GetBgColor(GtkWidget* widget, WidgetState state) {
return GdkColorToSkColor(gtk_rc_get_style(widget)->bg[stateMap[state]]);
}
@@ -132,16 +132,16 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
switch (color_id) {
// Windows
case kColorId_WindowBackground:
- return GetBGColor(GetWindow(), SELECTED);
+ return GetBgColor(GetWindow(), SELECTED);
// Dialogs
case kColorId_DialogBackground:
case kColorId_BubbleBackground:
- return GetBGColor(GetWindow(), NORMAL);
+ return GetBgColor(GetWindow(), NORMAL);
// FocusableBorder
case kColorId_FocusedBorderColor:
- return GetBGColor(GetEntry(), SELECTED);
+ return GetBgColor(GetEntry(), SELECTED);
case kColorId_UnfocusedBorderColor:
return GetTextAAColor(GetEntry(), NORMAL);
@@ -149,7 +149,7 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
case kColorId_SelectedMenuItemForegroundColor:
return GetTextColor(GetMenuItem(), SELECTED);
case kColorId_FocusedMenuItemBackgroundColor:
- return GetBGColor(GetMenuItem(), SELECTED);
+ return GetBgColor(GetMenuItem(), SELECTED);
case kColorId_EnabledMenuItemForegroundColor:
return GetTextColor(GetMenuItem(), NORMAL);
@@ -157,7 +157,7 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
case kColorId_DisabledMenuItemForegroundColor:
return GetTextColor(GetMenuItem(), INSENSITIVE);
case kColorId_FocusedMenuButtonBorderColor:
- return GetBGColor(GetEntry(), NORMAL);
+ return GetBgColor(GetEntry(), NORMAL);
case kColorId_HoverMenuButtonBorderColor:
return GetTextAAColor(GetEntry(), PRELIGHT);
case kColorId_MenuBorderColor:
@@ -166,7 +166,7 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
return GetTextColor(GetMenuItem(), INSENSITIVE);
}
case kColorId_MenuBackgroundColor:
- return GetBGColor(GetMenu(), NORMAL);
+ return GetBgColor(GetMenu(), NORMAL);
// Label
case kColorId_LabelEnabledColor:
@@ -238,14 +238,14 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
// Tooltips
case kColorId_TooltipBackground:
- return GetBGColor(GetTooltip(), NORMAL);
+ return GetBgColor(GetTooltip(), NORMAL);
case kColorId_TooltipText:
- return GetFGColor(GetTooltip(), NORMAL);
+ return GetFgColor(GetTooltip(), NORMAL);
// Trees and Tables (implemented on GTK using the same class)
case kColorId_TableBackground:
case kColorId_TreeBackground:
- return GetBGColor(GetTree(), NORMAL);
+ return GetBgColor(GetTree(), NORMAL);
case kColorId_TableText:
case kColorId_TreeText:
return GetTextColor(GetTree(), NORMAL);
@@ -258,9 +258,9 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
case kColorId_TableSelectionBackgroundUnfocused:
case kColorId_TreeSelectionBackgroundFocused:
case kColorId_TreeSelectionBackgroundUnfocused:
- return GetBGColor(GetTree(), SELECTED);
+ return GetBgColor(GetTree(), SELECTED);
case kColorId_TreeArrow:
- return GetFGColor(GetTree(), NORMAL);
+ return GetFgColor(GetTree(), NORMAL);
case kColorId_TableGroupingIndicatorColor:
return GetTextAAColor(GetTree(), NORMAL);
@@ -329,7 +329,7 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
case kColorId_ThrobberWaitingColor:
return color_utils::AlphaBlend(
GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused),
- GetBGColor(GetWindow(), NORMAL), 0x80);
+ GetBgColor(GetWindow(), NORMAL), 0x80);
// Alert icons
// Just fall back to the same colors as Aura.
« no previous file with comments | « chrome/browser/ui/libgtkui/gtk_util.cc ('k') | chrome/browser/ui/libgtkui/native_theme_gtk3.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698