views: Make View::set_border() take a scoped_ptr<>.

ui/views/controls/button/label_button.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.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/throb_animation.h"
@@ skipping 141 matching lines @@
   }
   if (style == STYLE_BUTTON) {
     label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     SetFocusable(true);
   }
   if (style == STYLE_BUTTON)
     set_min_size(gfx::Size(70, 33));
 
   ResetColorsFromNativeTheme();
 
-  UpdateThemedBorder(new LabelButtonBorder(style_));
+  UpdateThemedBorder(scoped_ptr<Border>(new LabelButtonBorder(style_)));
 
   // Invalidate the layout to pickup the new insets from the border.
   InvalidateLayout();
 }
 
 void LabelButton::SetFocusPainter(scoped_ptr<Painter> focus_painter) {
   focus_painter_ = focus_painter.Pass();
 }
 
 gfx::Size LabelButton::GetPreferredSize() {
@@ skipping 159 matching lines @@
       SetTextColor(static_cast<ButtonState>(state), colors[state]);
       explicitly_set_colors_[state] = false;
     }
   }
 }
 
 void LabelButton::UpdateImage() {
   image_->SetImage(GetImage(state()));
 }
 
-void LabelButton::UpdateThemedBorder(LabelButtonBorder* label_button_border) {
+void LabelButton::UpdateThemedBorder(scoped_ptr<Border> label_button_border) {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   views::LinuxUI* linux_ui = views::LinuxUI::instance();
   if (linux_ui) {
-    set_border(linux_ui->CreateNativeBorder(this, label_button_border));
+    SetBorder(linux_ui->CreateNativeBorder(this, label_button_border.Pass()));
   } else
 #endif
   {
-    set_border(label_button_border);
+    SetBorder(label_button_border.Pass());
   }
 }
 
 void LabelButton::StateChanged() {
   const gfx::Size previous_image_size(image_->GetPreferredSize());
   UpdateImage();
   const SkColor color = button_state_colors_[state()];
   if (state() != STATE_DISABLED && label_->enabled_color() != color)
     label_->SetEnabledColor(color);
   label_->SetEnabled(state() != STATE_DISABLED);
@@ skipping 40 matching lines @@
   return ui::NativeTheme::kNormal;
 }
 
 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 }  // namespace views