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

ui/views/controls/button/button.h

 // Copyright (c) 2011 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 UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_
 
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 class Button;
 class Event;
 
 // An interface implemented by an object to let it know that a button was
 // pressed.
 class VIEWS_EXPORT ButtonListener {
@@ skipping 20 matching lines @@
   };
 
   // Button styles with associated images and border painters.
   // TODO(msw): Add Menu, ComboBox, etc.
   enum ButtonStyle {
     STYLE_BUTTON = 0,
     STYLE_TEXTBUTTON,
     STYLE_COUNT,
   };
 
+  static ButtonState GetButtonStateFrom(ui::NativeTheme::State state);
+
   void SetTooltipText(const base::string16& tooltip_text);
 
   int tag() const { return tag_; }
   void set_tag(int tag) { tag_ = tag; }
 
   void SetAccessibleName(const base::string16& name);
 
   // Overridden from View:
   virtual bool GetTooltipText(const gfx::Point& p,
                               base::string16* tooltip) const OVERRIDE;
@@ skipping 21 matching lines @@
   // The id tag associated with this button. Used to disambiguate buttons in
   // the ButtonListener implementation.
   int tag_;
 
   DISALLOW_COPY_AND_ASSIGN(Button);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_