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

ui/views/controls/button/label_button_border.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 "ui/views/controls/button/label_button_border.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkLerpXfermode.h"
@@ skipping 13 matching lines @@
 namespace {
 
 // Insets for the unified button images. This assumes that the images
 // are of a 9 grid, of 5x5 size each.
 const int kButtonInsets = 5;
 
 // The text-button hot and pushed image IDs; normal is unadorned by default.
 const int kTextHoveredImages[] = IMAGE_GRID(IDR_TEXTBUTTON_HOVER);
 const int kTextPressedImages[] = IMAGE_GRID(IDR_TEXTBUTTON_PRESSED);
 
-Button::ButtonState GetButtonState(ui::NativeTheme::State state) {
-  switch (state) {
-    case ui::NativeTheme::kDisabled: return Button::STATE_DISABLED;
-    case ui::NativeTheme::kHovered:  return Button::STATE_HOVERED;
-    case ui::NativeTheme::kNormal:   return Button::STATE_NORMAL;
-    case ui::NativeTheme::kPressed:  return Button::STATE_PRESSED;
-    case ui::NativeTheme::kMaxState: NOTREACHED() << "Unknown state: " << state;
-  }
-  return Button::STATE_NORMAL;
-}
-
 // A helper function to paint the appropriate broder images.
 void PaintHelper(LabelButtonBorder* border,
                  gfx::Canvas* canvas,
                  ui::NativeTheme::State state,
                  const gfx::Rect& rect,
                  const ui::NativeTheme::ExtraParams& extra) {
   Painter* painter =
-      border->GetPainter(extra.button.is_focused, GetButtonState(state));
+      border->GetPainter(extra.button.is_focused,
+                         Button::GetButtonStateFrom(state));
   // Paint any corresponding unfocused painter if there is no focused painter.
   if (!painter && extra.button.is_focused)
-    painter = border->GetPainter(false, GetButtonState(state));
+    painter = border->GetPainter(false, Button::GetButtonStateFrom(state));
   if (painter)
     Painter::PaintPainterAt(canvas, painter, rect);
 }
 
 }  // namespace
 
 LabelButtonBorder::LabelButtonBorder(Button::ButtonStyle style)
     : style_(style) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::Insets insets(kButtonInsets,
@@ skipping 88 matching lines @@
   return painters_[focused ? 1 : 0][state].get();
 }
 
 void LabelButtonBorder::SetPainter(bool focused,
                                    Button::ButtonState state,
                                    Painter* painter) {
   painters_[focused ? 1 : 0][state].reset(painter);
 }
 
 }  // namespace views