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

ui/views/bubble/bubble_frame_view.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/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
@@ skipping 62 matching lines @@
   AddChildView(title_);
 
   close_ = new LabelButton(this, base::string16());
   close_->SetImage(CustomButton::STATE_NORMAL,
                    *rb.GetImageNamed(IDR_CLOSE_DIALOG).ToImageSkia());
   close_->SetImage(CustomButton::STATE_HOVERED,
                    *rb.GetImageNamed(IDR_CLOSE_DIALOG_H).ToImageSkia());
   close_->SetImage(CustomButton::STATE_PRESSED,
                    *rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
   close_->SetSize(close_->GetPreferredSize());
-  close_->set_border(NULL);
+  close_->SetBorder(scoped_ptr<Border>());
   close_->SetVisible(false);
   AddChildView(close_);
 }
 
 BubbleFrameView::~BubbleFrameView() {}
 
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = GetLocalBounds();
   client_bounds.Inset(GetInsets());
   client_bounds.Inset(bubble_border_->GetInsets());
@@ skipping 127 matching lines @@
   UpdateWindowTitle();
   ResetWindowControls();
   UpdateWindowIcon();
 }
 
 void BubbleFrameView::ButtonPressed(Button* sender, const ui::Event& event) {
   if (sender == close_)
     GetWidget()->Close();
 }
 
-void BubbleFrameView::SetBubbleBorder(BubbleBorder* border) {
-  bubble_border_ = border;
-  set_border(bubble_border_);
+void BubbleFrameView::SetBubbleBorder(scoped_ptr<BubbleBorder> border) {
+  bubble_border_ = border.get();
+  SetBorder(border.PassAs<Border>());
 
   // Update the background, which relies on the border.
-  set_background(new views::BubbleBackground(border));
+  set_background(new views::BubbleBackground(bubble_border_));
 }
 
 void BubbleFrameView::SetTitlebarExtraView(View* view) {
   DCHECK(view);
   DCHECK(!titlebar_extra_view_);
   AddChildView(view);
   titlebar_extra_view_ = view;
 }
 
 gfx::Rect BubbleFrameView::GetUpdatedWindowBounds(const gfx::Rect& anchor_rect,
@@ skipping 99 matching lines @@
   if (titlebar_extra_view_ != NULL)
     title_bar_width += titlebar_extra_view_->GetPreferredSize().width();
   gfx::Size size(client_size);
   size.SetToMax(gfx::Size(title_bar_width, 0));
   const gfx::Insets insets(GetInsets());
   size.Enlarge(insets.width(), insets.height());
   return size;
 }
 
 }  // namespace views