linux_aura: Fix the insets on LabelButtons.

ui/views/controls/button/blue_button.cc

 // Copyright 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.
 
 #include "ui/views/controls/button/blue_button.h"
 
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/sys_color_change_listener.h"
 #include "ui/views/controls/button/label_button_border.h"
@@ skipping 27 matching lines @@
       SetTextColor(static_cast<ButtonState>(state), kBlueButtonTextColor);
     label()->SetShadowColors(kBlueButtonShadowColor, kBlueButtonShadowColor);
     label()->SetShadowOffset(0, 1);
   }
 }
 
 const char* BlueButton::GetClassName() const {
   return BlueButton::kViewClassName;
 }
 
-scoped_ptr<Border> BlueButton::CreateDefaultBorder() const {
+scoped_ptr<views::LabelButtonBorder> BlueButton::CreateDefaultBorder() const {

[msw, 2014/05/21 22:57:14]

nit: remove views:: namespace qualifier.

   // Insets for splitting the images.
   const gfx::Insets insets(5, 5, 5, 5);
   scoped_ptr<LabelButtonBorder> button_border(new LabelButtonBorder(style()));
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   button_border->SetPainter(false, STATE_NORMAL, Painter::CreateImagePainter(
       *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_NORMAL), insets));
   button_border->SetPainter(false, STATE_HOVERED, Painter::CreateImagePainter(
       *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_HOVER), insets));
   button_border->SetPainter(false, STATE_PRESSED, Painter::CreateImagePainter(
       *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_PRESSED), insets));
   button_border->SetPainter(false, STATE_DISABLED, Painter::CreateImagePainter(
       *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));
   button_border->SetPainter(true, STATE_NORMAL, Painter::CreateImagePainter(
       *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_NORMAL), insets));
   button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter(
       *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets));
   button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter(
       *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets));
   button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter(
       *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));
-  return button_border.PassAs<Border>();
+  return button_border.Pass();
 }
 
 }  // namespace views