linux_aura: Use GTK button borders in GTK theme mode.

chrome/browser/ui/libgtk2ui/gtk2_ui.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "chrome/browser/ui/libgtk2ui/libgtk2ui_export.h"
 #include "chrome/browser/ui/libgtk2ui/owned_widget_gtk2.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/gfx/geometry/insets.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/window/frame_buttons.h"
 
 typedef struct _GdkColor GdkColor;
+typedef struct _GtkBorder GtkBorder;
 typedef struct _GtkStyle GtkStyle;
 typedef struct _GtkWidget GtkWidget;
 
 class SkBitmap;
 
 namespace gfx {
 class Image;
 }
 
 namespace libgtk2ui {
+class Gtk2Border;
 class GConfTitlebarListener;
 
 // Interface to GTK2 desktop features.
 //
 class Gtk2UI : public views::LinuxUI {
  public:
   Gtk2UI();
   virtual ~Gtk2UI();
 
   void SetWindowButtonOrdering(
     const std::vector<views::FrameButton>& leading_buttons,
     const std::vector<views::FrameButton>& trailing_buttons);
 
+  // Draws the GTK button border for state |gtk_state| onto a bitmap.
+  SkBitmap DrawGtkButtonBorder(int gtk_state, int width, int height) const;
+
+  // Returns the current insets for a button.
+  gfx::Insets GetButtonInsets() const;
+
+  // We keep track of live Gtk2Border objects since we must alert them to theme
+  // changes.
+  void AddGtkBorder(Gtk2Border* border);
+  void RemoveGtkBorder(Gtk2Border* border);
+
   // ui::LinuxInputMethodContextFactory:
   virtual scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
       ui::LinuxInputMethodContextDelegate* delegate) const OVERRIDE;
 
   // gfx::LinuxFontDelegate:
   virtual bool UseAntialiasing() const OVERRIDE;
   virtual gfx::FontRenderParams::Hinting GetHintingStyle() const OVERRIDE;
   virtual gfx::FontRenderParams::SubpixelRendering
       GetSubpixelRenderingStyle() const OVERRIDE;
   virtual std::string GetDefaultFontName() const OVERRIDE;
@@ skipping 12 matching lines @@
   virtual SkColor GetThumbActiveColor() const OVERRIDE;
   virtual SkColor GetThumbInactiveColor() const OVERRIDE;
   virtual SkColor GetTrackColor() const OVERRIDE;
   virtual SkColor GetActiveSelectionBgColor() const OVERRIDE;
   virtual SkColor GetActiveSelectionFgColor() const OVERRIDE;
   virtual SkColor GetInactiveSelectionBgColor() const OVERRIDE;
   virtual SkColor GetInactiveSelectionFgColor() const OVERRIDE;
   virtual double GetCursorBlinkInterval() const OVERRIDE;
   virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE;
   virtual void SetUseSystemTheme(bool use_system_theme) OVERRIDE;
+  virtual bool GetUseSystemTheme() const OVERRIDE;
   virtual bool GetDefaultUsesSystemTheme() const OVERRIDE;
   virtual void SetDownloadCount(int count) const OVERRIDE;
   virtual void SetProgressFraction(float percentage) const OVERRIDE;
   virtual bool IsStatusIconSupported() const OVERRIDE;
   virtual scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
       const gfx::ImageSkia& image,
       const base::string16& tool_tip) const OVERRIDE;
   virtual gfx::Image GetIconForContentType(
       const std::string& content_type, int size) const OVERRIDE;
+  virtual views::Border* CreateNativeBorder(
+      views::View* owning_view,
+      views::LabelButtonBorder* label_button_border) OVERRIDE;

[msw, 2014/01/21 19:18:19]

Just use a views::Border here.

   virtual void AddWindowButtonOrderObserver(
       views::WindowButtonOrderObserver* observer) OVERRIDE;
   virtual void RemoveWindowButtonOrderObserver(
       views::WindowButtonOrderObserver* observer) OVERRIDE;
   virtual bool UnityIsRunning() OVERRIDE;
 
  private:
   typedef std::map<int, SkColor> ColorMap;
   typedef std::map<int, color_utils::HSL> TintMap;
   typedef std::map<int, gfx::Image> ImageCache;
@@ skipping 59 matching lines @@
   // background color.
   void GetNormalButtonTintHSL(color_utils::HSL* tint) const;
 
   // Returns a tint that's the color of the current normal text in an entry.
   void GetNormalEntryForegroundHSL(color_utils::HSL* tint) const;
 
   // Returns a tint that's the color of the current highlighted text in an
   // entry.
   void GetSelectedEntryForegroundHSL(color_utils::HSL* tint) const;
 
-  // Draws the GTK button border for state |gtk_state| onto a bitmap.
-  SkBitmap DrawGtkButtonBorder(int gtk_state, int width, int height) const;
+  // Create a GTK window and button and queries what "default-border" is, which
+  // corresponds with our insets.
+  void UpdateButtonInsets();
 
   // Frees all calculated images and color data.
   void ClearAllThemeData();
 
   GtkWidget* fake_window_;
   GtkWidget* fake_frame_;
   OwnedWidgetGtk fake_label_;
   OwnedWidgetGtk fake_entry_;
 
   // Tints and colors calculated by LoadGtkValues() that are given to the
@@ skipping 10 matching lines @@
   // changes.
   SkColor focus_ring_color_;
   SkColor thumb_active_color_;
   SkColor thumb_inactive_color_;
   SkColor track_color_;
   SkColor active_selection_bg_color_;
   SkColor active_selection_fg_color_;
   SkColor inactive_selection_bg_color_;
   SkColor inactive_selection_fg_color_;
 
+  gfx::Insets button_insets_;
+
 #if defined(USE_GCONF)
   // Currently, the only source of window button configuration. This will
   // change if we ever have to support XFCE's configuration system or KDE's.
   scoped_ptr<GConfTitlebarListener> titlebar_listener_;
 #endif  // defined(USE_GCONF)
 
   // If either of these vectors are non-empty, they represent the current
   // window button configuration.
   std::vector<views::FrameButton> leading_buttons_;
   std::vector<views::FrameButton> trailing_buttons_;
 
   // Objects to notify when the window frame button order changes.
   ObserverList<views::WindowButtonOrderObserver> observer_list_;
 
+  // Borders to notify when the theme state changes.
+  ObserverList<Gtk2Border> border_list_;
+
   // Image cache of lazily created images.
   mutable ImageCache gtk_images_;
 
   // Whether to use the Gtk2 version of the native theme.
   bool use_gtk_;
 
   DISALLOW_COPY_AND_ASSIGN(Gtk2UI);
 };
 
 }  // namespace libgtk2ui
 
 // Access point to the GTK2 desktop system. This should be the only symbol that
 // is exported in the library; everything else should be used through the
 // interface, because eventually this .so will be loaded through dlopen at
 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
 // QT or whatever.
 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI();
 
 #endif  // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_