linux_aura: Fixes a couple of issues with the button border integration.

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>
 
@@ skipping 27 matching lines @@
 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;
+  SkBitmap DrawGtkButtonBorder(int gtk_state,
+                               bool focused,
+                               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:
@@ skipping 32 matching lines @@
   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::CustomButton* owning_button,
+      views::LabelButton* owning_button,
       views::Border* border) OVERRIDE;
   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;
@@ skipping 131 matching lines @@
 }  // 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_