Gtk3: Add support for Gtk3.20 themes

chrome/browser/ui/libgtkui/native_theme_gtk3.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/libgtkui/native_theme_gtk3.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h"
@@ skipping 56 matching lines @@
   switch (color_id) {
     // Windows
     case ui::NativeTheme::kColorId_WindowBackground:
     // Dialogs
     case ui::NativeTheme::kColorId_DialogBackground:
     case ui::NativeTheme::kColorId_BubbleBackground:
       return GetBgColor("");
 
     // FocusableBorder
     case ui::NativeTheme::kColorId_FocusedBorderColor:
-      return GetBorderColor("GtkEntry.entry:focus");
+      return GetBorderColor("GtkEntry#entry:focus");
     case ui::NativeTheme::kColorId_UnfocusedBorderColor:
-      return GetBorderColor("GtkEntry.entry");
+      return GetBorderColor("GtkEntry#entry");
 
     // Menu
     case ui::NativeTheme::kColorId_MenuBackgroundColor:
-      return GetBgColor("GtkMenu.menu");
+      return GetBgColor("GtkMenu#menu");
     case ui::NativeTheme::kColorId_MenuBorderColor:
-      return GetBorderColor("GtkMenu.menu");
+      return GetBorderColor("GtkMenu#menu");
     case ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
-      return GetBgColor("GtkMenu.menu GtkMenuItem.menuitem:focus");
+      return GetBgColor("GtkMenu#menu GtkMenuItem#menuitem:focus");
     case ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor:
-      return GetFgColor("GtkMenu.menu GtkMenuItem.menuitem GtkLabel.label");
+      return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem GtkLabel#label");
     case ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor:
       return GetFgColor(
-          "GtkMenu.menu GtkMenuItem.menuitem:selected GtkLabel.label");
+          "GtkMenu#menu GtkMenuItem#menuitem:selected GtkLabel#label");
     case ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor:
       return GetFgColor(
-          "GtkMenu.menu GtkMenuItem.menuitem:disabled GtkLabel.label");
+          "GtkMenu#menu GtkMenuItem#menuitem:disabled GtkLabel#label");
     case ui::NativeTheme::kColorId_MenuItemSubtitleColor:
       return GetFgColor(
-          "GtkMenu.menu GtkMenuItem.menuitem GtkLabel.label.accelerator");
+          "GtkMenu#menu GtkMenuItem#menuitem GtkLabel#label.accelerator");
     case ui::NativeTheme::kColorId_MenuSeparatorColor:
     // MenuButton borders are used the same way as menu separators in Chrome.
     case ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor:
     case ui::NativeTheme::kColorId_FocusedMenuButtonBorderColor:
     case ui::NativeTheme::kColorId_HoverMenuButtonBorderColor:
-      return GetFgColor("GtkMenu.menu GtkMenuItem.menuitem.separator:disabled");
+      return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem.separator:disabled");
 
     // Label
     case ui::NativeTheme::kColorId_LabelEnabledColor:
-      return GetFgColor("GtkLabel.label");
+      return GetFgColor("GtkLabel#label");
     case ui::NativeTheme::kColorId_LabelDisabledColor:
-      return GetFgColor("GtkLabel.label:disabled");
+      return GetFgColor("GtkLabel#label:disabled");
     case ui::NativeTheme::kColorId_LabelTextSelectionColor:
-      return GetFgColor("GtkLabel.label .selection:selected");
+      return GetFgColor("GtkLabel#label #selection:selected");
     case ui::NativeTheme::kColorId_LabelTextSelectionBackgroundFocused:
-      return GetBgColor("GtkLabel.label .selection:selected");
+      return GetBgColor("GtkLabel#label #selection:selected");
 
     // Link
     case ui::NativeTheme::kColorId_LinkDisabled:
       return SkColorSetA(
           SkColorFromColorId(ui::NativeTheme::kColorId_LinkEnabled), 0xBB);
     case ui::NativeTheme::kColorId_LinkPressed:
     case ui::NativeTheme::kColorId_LinkEnabled: {
       // TODO(thomasanderson): Gtk changed the way links are colored in 3.12.
       // Add code for later versions.
-      auto link_context = GetStyleContextFromCss("GtkLabel.label.view");
+      auto link_context = GetStyleContextFromCss("GtkLabel#label.view");
       GdkColor* color;
       gtk_style_context_get_style(link_context, "link-color", &color, nullptr);
       if (color) {
         SkColor ret_color = SkColorSetRGB(color->red / 255, color->green / 255,
                                           color->blue / 255);
         gdk_color_free(color);
         return ret_color;
       } else {
         // Default color comes from gtklinkbutton.c.
         return SkColorSetRGB(0x00, 0x00, 0xEE);
       }
     }
 
     // Button
     case ui::NativeTheme::kColorId_ButtonEnabledColor:
-      return GetFgColor("GtkButton.button.text-button GtkLabel.label");
+      return GetFgColor("GtkButton#button.text-button GtkLabel#label");
     case ui::NativeTheme::kColorId_ButtonDisabledColor:
-      return GetFgColor("GtkButton.button.text-button:disabled GtkLabel.label");
+      return GetFgColor("GtkButton#button.text-button:disabled GtkLabel#label");
     case ui::NativeTheme::kColorId_ButtonHoverColor:
-      return GetFgColor("GtkButton.button.text-button:hover GtkLabel.label");
+      return GetFgColor("GtkButton#button.text-button:hover GtkLabel#label");
     case ui::NativeTheme::kColorId_ButtonPressedShade:
       return SK_ColorTRANSPARENT;
 
     case ui::NativeTheme::kColorId_BlueButtonEnabledColor:
       return GetFgColor(
-          "GtkButton.button.text-button.suggested-action GtkLabel.label");
+          "GtkButton#button.text-button.suggested-action GtkLabel#label");
     case ui::NativeTheme::kColorId_BlueButtonDisabledColor:
       return GetFgColor(
-          "GtkButton.button.text-button.suggested-action:disabled "
-          "GtkLabel.label");
+          "GtkButton#button.text-button.suggested-action:disabled "
+          "GtkLabel#label");
     case ui::NativeTheme::kColorId_BlueButtonHoverColor:
       return GetFgColor(
-          "GtkButton.button.text-button.suggested-action:hover GtkLabel.label");
+          "GtkButton#button.text-button.suggested-action:hover GtkLabel#label");
     case ui::NativeTheme::kColorId_BlueButtonPressedColor:
       return GetFgColor(
-          "GtkButton.button.text-button.suggested-action:hover:active "
-          "GtkLabel.label");
+          "GtkButton#button.text-button.suggested-action:hover:active "
+          "GtkLabel#label");
     case ui::NativeTheme::kColorId_BlueButtonShadowColor:
       return SK_ColorTRANSPARENT;
 
     case ui::NativeTheme::kColorId_ProminentButtonColor:
-      return GetBgColor("GtkButton.button.text-button.destructive-action");
+      return GetBgColor("GtkButton#button.text-button.destructive-action");
     case ui::NativeTheme::kColorId_TextOnProminentButtonColor:
       return GetFgColor(
-          "GtkButton.button.text-button.destructive-action GtkLabel.label");
+          "GtkButton#button.text-button.destructive-action GtkLabel#label");
 
     // Textfield
     case ui::NativeTheme::kColorId_TextfieldDefaultColor:
-      return GetFgColor("GtkEntry.entry");
+      return GetFgColor("GtkEntry#entry");
     case ui::NativeTheme::kColorId_TextfieldDefaultBackground:
-      return GetBgColor("GtkEntry.entry");
+      return GetBgColor("GtkEntry#entry");
     case ui::NativeTheme::kColorId_TextfieldReadOnlyColor:
-      return GetFgColor("GtkEntry.entry:disabled");
+      return GetFgColor("GtkEntry#entry:disabled");
     case ui::NativeTheme::kColorId_TextfieldReadOnlyBackground:
-      return GetBgColor("GtkEntry.entry:disabled");
+      return GetBgColor("GtkEntry#entry:disabled");
     case ui::NativeTheme::kColorId_TextfieldSelectionColor:
-      return GetFgColor("GtkEntry.entry .selection:selected");
+      return GetFgColor("GtkEntry#entry #selection:selected");
     case ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused:
-      return GetBgColor("GtkEntry.entry .selection:selected");
+      return GetBgColor("GtkEntry#entry #selection:selected");
 
     // Tooltips
     case ui::NativeTheme::kColorId_TooltipBackground:
-      return GetBgColor("GtkTooltip.tooltip");
+      return GetBgColor("GtkTooltip#tooltip");
     case ui::NativeTheme::kColorId_TooltipText:
-      return color_utils::GetReadableColor(GetFgColor("GtkTooltip.tooltip"),
-                                           GetBgColor("GtkTooltip.tooltip"));
+      return color_utils::GetReadableColor(GetFgColor("GtkTooltip#tooltip"),
+                                           GetBgColor("GtkTooltip#tooltip"));
 
     // Trees and Tables (implemented on GTK using the same class)
     case ui::NativeTheme::kColorId_TableBackground:
     case ui::NativeTheme::kColorId_TreeBackground:
-      return GetBgColor("GtkTreeView.view");
+      return GetBgColor("GtkTreeView#treeview.view");
     case ui::NativeTheme::kColorId_TableText:
     case ui::NativeTheme::kColorId_TreeText:
     case ui::NativeTheme::kColorId_TreeArrow:
     case ui::NativeTheme::kColorId_TableGroupingIndicatorColor:
-      return GetFgColor("GtkTreeView.view .cell");
+      return GetFgColor("GtkTreeView#treeview.view .cell");
     case ui::NativeTheme::kColorId_TableSelectedText:
     case ui::NativeTheme::kColorId_TableSelectedTextUnfocused:
     case ui::NativeTheme::kColorId_TreeSelectedText:
     case ui::NativeTheme::kColorId_TreeSelectedTextUnfocused:
-      return GetFgColor("GtkTreeView.view .cell:selected");
+      return GetFgColor("GtkTreeView#treeview.view .cell:selected");
     case ui::NativeTheme::kColorId_TableSelectionBackgroundFocused:
     case ui::NativeTheme::kColorId_TableSelectionBackgroundUnfocused:
     case ui::NativeTheme::kColorId_TreeSelectionBackgroundFocused:
     case ui::NativeTheme::kColorId_TreeSelectionBackgroundUnfocused:
-      return GetBgColor("GtkTreeView.view .cell:selected");
+      return GetBgColor("GtkTreeView#treeview.view .cell:selected");
 
     // Results Table
     // TODO(thomasanderson): The GtkEntry selectors was how the gtk2 theme got
     // these colors.  Update this code to use a different widget.
     case ui::NativeTheme::kColorId_ResultsTableNormalBackground:
-      return GetBgColor("GtkEntry.entry");
+      return GetBgColor("GtkEntry#entry");
     case ui::NativeTheme::kColorId_ResultsTableHoveredBackground:
       return color_utils::AlphaBlend(
-          GetBgColor("GtkEntry.entry"),
-          GetBgColor("GtkEntry.entry .selection:selected"), 0x80);
+          GetBgColor("GtkEntry#entry"),
+          GetBgColor("GtkEntry#entry #selection:selected"), 0x80);
     case ui::NativeTheme::kColorId_ResultsTableSelectedBackground:
-      return GetBgColor("GtkEntry.entry .selection:selected");
+      return GetBgColor("GtkEntry#entry #selection:selected");
     case ui::NativeTheme::kColorId_ResultsTableNormalText:
     case ui::NativeTheme::kColorId_ResultsTableHoveredText:
-      return GetFgColor("GtkEntry.entry");
+      return GetFgColor("GtkEntry#entry");
     case ui::NativeTheme::kColorId_ResultsTableSelectedText:
-      return GetFgColor("GtkEntry.entry .selection:selected");
+      return GetFgColor("GtkEntry#entry #selection:selected");
     case ui::NativeTheme::kColorId_ResultsTableNormalDimmedText:
     case ui::NativeTheme::kColorId_ResultsTableHoveredDimmedText:
-      return color_utils::AlphaBlend(GetFgColor("GtkEntry.entry"),
-                                     GetBgColor("GtkEntry.entry"), 0x80);
+      return color_utils::AlphaBlend(GetFgColor("GtkEntry#entry"),
+                                     GetBgColor("GtkEntry#entry"), 0x80);
     case ui::NativeTheme::kColorId_ResultsTableSelectedDimmedText:
       return color_utils::AlphaBlend(
-          GetFgColor("GtkEntry.entry .selection:selected"),
-          GetBgColor("GtkEntry.entry"), 0x80);
+          GetFgColor("GtkEntry#entry #selection:selected"),
+          GetBgColor("GtkEntry#entry"), 0x80);
     case ui::NativeTheme::kColorId_ResultsTableNormalUrl:
     case ui::NativeTheme::kColorId_ResultsTableHoveredUrl:
-      return NormalURLColor(GetFgColor("GtkEntry.entry"));
+      return NormalURLColor(GetFgColor("GtkEntry#entry"));
     case ui::NativeTheme::kColorId_ResultsTableSelectedUrl:
-      return SelectedURLColor(GetFgColor("GtkEntry.entry .selection:selected"),
-                              GetBgColor("GtkEntry.entry .selection:selected"));
+      return SelectedURLColor(GetFgColor("GtkEntry#entry #selection:selected"),
+                              GetBgColor("GtkEntry#entry #selection:selected"));
 
     case ui::NativeTheme::kColorId_ResultsTablePositiveText:
       return color_utils::GetReadableColor(kPositiveTextColor,
-                                           GetBgColor("GtkEntry.entry"));
+                                           GetBgColor("GtkEntry#entry"));
     case ui::NativeTheme::kColorId_ResultsTablePositiveHoveredText:
       return color_utils::GetReadableColor(kPositiveTextColor,
-                                           GetBgColor("GtkEntry.entry:hover"));
+                                           GetBgColor("GtkEntry#entry:hover"));
     case ui::NativeTheme::kColorId_ResultsTablePositiveSelectedText:
       return color_utils::GetReadableColor(
-          kPositiveTextColor, GetBgColor("GtkEntry.entry:selected"));
+          kPositiveTextColor, GetBgColor("GtkEntry#entry:selected"));
     case ui::NativeTheme::kColorId_ResultsTableNegativeText:
       return color_utils::GetReadableColor(kNegativeTextColor,
-                                           GetBgColor("GtkEntry.entry"));
+                                           GetBgColor("GtkEntry#entry"));
     case ui::NativeTheme::kColorId_ResultsTableNegativeHoveredText:
       return color_utils::GetReadableColor(kNegativeTextColor,
-                                           GetBgColor("GtkEntry.entry:hover"));
+                                           GetBgColor("GtkEntry#entry:hover"));
     case ui::NativeTheme::kColorId_ResultsTableNegativeSelectedText:
       return color_utils::GetReadableColor(
-          kNegativeTextColor, GetBgColor("GtkEntry.entry:selected"));
+          kNegativeTextColor, GetBgColor("GtkEntry#entry:selected"));
 
     // Throbber
     // TODO(thomasanderson): Render GtkSpinner directly.
     case ui::NativeTheme::kColorId_ThrobberSpinningColor:
     case ui::NativeTheme::kColorId_ThrobberWaitingColor:
-      return GetFgColor("GtkMenu.menu GtkSpinner.spinner");
+      return GetFgColor("GtkMenu#menu GtkSpinner#spinner");
     case ui::NativeTheme::kColorId_ThrobberLightColor:
-      return GetFgColor("GtkMenu.menu GtkSpinner.spinner:disabled");
+      return GetFgColor("GtkMenu#menu GtkSpinner#spinner:disabled");
 
     // Alert icons
     case ui::NativeTheme::kColorId_AlertSeverityLow:
-      return GetBgColor("GtkInfoBar.infobar.info");
+      return GetBgColor("GtkInfoBar#infobar.info");
     case ui::NativeTheme::kColorId_AlertSeverityMedium:
-      return GetBgColor("GtkInfoBar.infobar.warning");
+      return GetBgColor("GtkInfoBar#infobar.warning");
     case ui::NativeTheme::kColorId_AlertSeverityHigh:
-      return GetBgColor("GtkInfoBar.infobar.error");
+      return GetBgColor("GtkInfoBar#infobar.error");
 
     case ui::NativeTheme::kColorId_NumColors:
       NOTREACHED();
       break;
   }
   return kInvalidColorIdColor;
 }
 
 void OnThemeChanged(GObject* obj, GParamSpec* param, NativeThemeGtk3* theme) {
   theme->ResetColorCache();
@@ skipping 44 matching lines @@
 
   SkColor color = SkColorFromColorId(color_id);
   color_cache_[color_id] = color;
   return color;
 }
 
 void NativeThemeGtk3::PaintMenuPopupBackground(
     SkCanvas* canvas,
     const gfx::Size& size,
     const MenuBackgroundExtraParams& menu_background) const {
-  PaintWidget(canvas, gfx::Rect(size), "GtkMenu.menu", GTK_STATE_FLAG_NORMAL);
+  PaintWidget(canvas, gfx::Rect(size), "GtkMenu#menu", GTK_STATE_FLAG_NORMAL);
 }
 
 void NativeThemeGtk3::PaintMenuItemBackground(
     SkCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const MenuItemExtraParams& menu_item) const {
-  PaintWidget(canvas, rect, "GtkMenu.menu GtkMenuItem.menuitem",
+  PaintWidget(canvas, rect, "GtkMenu#menu GtkMenuItem#menuitem",
               StateToStateFlags(state));
 }
 
 }  // namespace libgtkui