linux_aura: Use GTK button borders in GTK theme mode.

chrome/browser/ui/libgtk2ui/gtk2_ui.cc

 // Copyright (c) 2012 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/libgtk2ui/gtk2_ui.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/nix/mime_util_xdg.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h"
 #include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h"
+#include "chrome/browser/ui/libgtk2ui/gtk2_border.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
 #include "chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h"
 #include "chrome/browser/ui/libgtk2ui/printing_gtk2_util.h"
 #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
 #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
 #include "chrome/browser/ui/libgtk2ui/unity_service.h"
 #include "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
@@ skipping 127 matching lines @@
   { IDR_FORWARD,   GTK_STOCK_GO_FORWARD, GTK_STATE_NORMAL },
   { IDR_FORWARD_D, GTK_STOCK_GO_FORWARD, GTK_STATE_INSENSITIVE },
   { IDR_FORWARD_H, GTK_STOCK_GO_FORWARD, GTK_STATE_PRELIGHT },
   { IDR_FORWARD_P, GTK_STOCK_GO_FORWARD, GTK_STATE_ACTIVE },
 
   { IDR_HOME,      GTK_STOCK_HOME,       GTK_STATE_NORMAL },
   { IDR_HOME_H,    GTK_STOCK_HOME,       GTK_STATE_PRELIGHT },
   { IDR_HOME_P,    GTK_STOCK_HOME,       GTK_STATE_ACTIVE },
 
   { IDR_RELOAD,    GTK_STOCK_REFRESH,    GTK_STATE_NORMAL },
+  { IDR_RELOAD_D,  GTK_STOCK_REFRESH,    GTK_STATE_INSENSITIVE },
   { IDR_RELOAD_H,  GTK_STOCK_REFRESH,    GTK_STATE_PRELIGHT },
   { IDR_RELOAD_P,  GTK_STOCK_REFRESH,    GTK_STATE_ACTIVE },
 
   { IDR_STOP,      GTK_STOCK_STOP,       GTK_STATE_NORMAL },
   { IDR_STOP_D,    GTK_STOCK_STOP,       GTK_STATE_INSENSITIVE },
   { IDR_STOP_H,    GTK_STOCK_STOP,       GTK_STATE_PRELIGHT },
   { IDR_STOP_P,    GTK_STOCK_STOP,       GTK_STATE_ACTIVE },
 };
 
 // The image resources that will be tinted by the 'button' tint value.
@@ skipping 262 matching lines @@
   return cursor_blink ? (cursor_blink_time / kGtkCursorBlinkCycleFactor) : 0.0;
 }
 
 ui::NativeTheme* Gtk2UI::GetNativeTheme() const {
   return use_gtk_ ? NativeThemeGtk2::instance() :
                     ui::NativeTheme::instance();
 }
 
 void Gtk2UI::SetUseSystemTheme(bool use_system_theme) {
   use_gtk_ = use_system_theme;
+
+  FOR_EACH_OBSERVER(Gtk2Border, border_list_,
+                    InvalidateAndSetUsesGtk(use_system_theme));
+}
+
+bool Gtk2UI::GetUseSystemTheme() const {
+  return use_gtk_;
 }
 
 bool Gtk2UI::GetDefaultUsesSystemTheme() const {
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   switch (base::nix::GetDesktopEnvironment(env.get())) {
     case base::nix::DESKTOP_ENVIRONMENT_GNOME:
     case base::nix::DESKTOP_ENVIRONMENT_UNITY:
     case base::nix::DESKTOP_ENVIRONMENT_XFCE:
       return true;
@@ skipping 53 matching lines @@
     return gfx::Image();
 
   SkBitmap bitmap = GdkPixbufToImageSkia(pixbuf.get());
   DCHECK_EQ(size, bitmap.width());
   DCHECK_EQ(size, bitmap.height());
   gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   image_skia.MakeThreadSafe();
   return gfx::Image(image_skia);
 }
 
+views::Border* Gtk2UI::CreateNativeBorder(
+    views::View* owning_view,
+    views::LabelButtonBorder* label_button_border) {
+  return new Gtk2Border(this, owning_view, label_button_border);
+}
+
 void Gtk2UI::AddWindowButtonOrderObserver(
     views::WindowButtonOrderObserver* observer) {
   if (!leading_buttons_.empty() || !trailing_buttons_.empty()) {
     observer->OnWindowButtonOrderingChange(leading_buttons_,
                                            trailing_buttons_);
   }
 
   observer_list_.AddObserver(observer);
 }
 
@@ skipping 333 matching lines @@
   // Some GTK themes only define the text selection colors on the GtkEntry
   // class, so we need to use that for getting selection colors.
   active_selection_bg_color_ =
       GdkColorToSkColor(entry_style->base[GTK_STATE_SELECTED]);
   active_selection_fg_color_ =
       GdkColorToSkColor(entry_style->text[GTK_STATE_SELECTED]);
   inactive_selection_bg_color_ =
       GdkColorToSkColor(entry_style->base[GTK_STATE_ACTIVE]);
   inactive_selection_fg_color_ =
       GdkColorToSkColor(entry_style->text[GTK_STATE_ACTIVE]);
+
+  // Update the insets that we hand to Gtk2Border.
+  UpdateButtonInsets();
 }
 
 GdkColor Gtk2UI::BuildFrameColors(GtkStyle* frame_style) {
   GdkColor* theme_frame = NULL;
   GdkColor* theme_inactive_frame = NULL;
   GdkColor* theme_incognito_frame = NULL;
   GdkColor* theme_incognito_inactive_frame = NULL;
   gtk_widget_style_get(GTK_WIDGET(fake_frame_),
                        "frame-color", &theme_frame,
                        "inactive-frame-color", &theme_inactive_frame,
@@ skipping 140 matching lines @@
     case IDR_BACK_H:
     case IDR_BACK_P:
     case IDR_FORWARD:
     case IDR_FORWARD_D:
     case IDR_FORWARD_H:
     case IDR_FORWARD_P:
     case IDR_HOME:
     case IDR_HOME_H:
     case IDR_HOME_P:
     case IDR_RELOAD:
+    case IDR_RELOAD_D:
     case IDR_RELOAD_H:
     case IDR_RELOAD_P:
     case IDR_STOP:
     case IDR_STOP_D:
     case IDR_STOP_H:
     case IDR_STOP_P: {
       return GenerateGTKIcon(id);
     }
     case IDR_TOOLBAR_BEZEL_HOVER:
       return GenerateToolbarBezel(GTK_STATE_PRELIGHT, IDR_TOOLBAR_BEZEL_HOVER);
@@ skipping 214 matching lines @@
 
   // Finally, we convert our pixbuf into a type we can use.
   SkBitmap border = GdkPixbufToImageSkia(pixbuf);
   g_object_unref(pixbuf);
   g_object_unref(pixmap);
   gtk_widget_destroy(window);
 
   return border;
 }
 
+gfx::Insets Gtk2UI::GetButtonInsets() const {
+  return button_insets_;
+}
+
+void Gtk2UI::AddGtkBorder(Gtk2Border* border) {
+  border_list_.AddObserver(border);
+}
+
+void Gtk2UI::RemoveGtkBorder(Gtk2Border* border) {
+  border_list_.RemoveObserver(border);
+}
+
+void Gtk2UI::UpdateButtonInsets() {
+  GtkWidget* window = gtk_offscreen_window_new();
+  GtkWidget* button = gtk_button_new();
+  gtk_container_add(GTK_CONTAINER(window), button);
+
+  GtkBorder* border = NULL;
+  gtk_widget_style_get(GTK_WIDGET(button),
+                       "default-border",
+                       &border,
+                       NULL);
+
+  gfx::Insets insets;
+  if (border) {
+    button_insets_ = gfx::Insets(border->top, border->left,
+                                 border->bottom, border->right);
+    gtk_border_free(border);
+  } else {
+    // Defined in gtkbutton.c:
+    button_insets_ = gfx::Insets(1, 1, 1, 1);
+  }
+
+  gtk_widget_destroy(window);
+}
+
 void Gtk2UI::ClearAllThemeData() {
   gtk_images_.clear();
 }
 
 }  // namespace libgtk2ui
 
 views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }