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

chrome/browser/ui/views/location_bar/location_bar_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 "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 217 matching lines @@
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
   if (browser_)
     browser_->search_model()->RemoveObserver(this);
 }
 
 // static
 void LocationBarView::InitTouchableLocationBarChildView(views::View* view) {
   int horizontal_padding = GetBuiltInHorizontalPaddingForChildViews();
   if (horizontal_padding != 0) {
-    view->set_border(views::Border::CreateEmptyBorder(
+    view->SetBorder(views::Border::CreateEmptyBorder(
         3, horizontal_padding, 3, horizontal_padding));
   }
 }
 
 void LocationBarView::Init() {
   // We need to be in a Widget, otherwise GetNativeTheme() may change and we're
   // not prepared for that.
   DCHECK(GetWidget());
 
   const int kOmniboxPopupBorderImages[] =
@@ skipping 126 matching lines @@
   star_view_ = new StarView(command_updater());
   star_view_->SetVisible(false);
   AddChildView(star_view_);
 
   search_button_ = new views::LabelButton(this, base::string16());
   search_button_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
   search_button_->SetStyle(views::Button::STYLE_BUTTON);
   search_button_->SetFocusable(false);
   search_button_->set_min_size(gfx::Size());
-  views::LabelButtonBorder* search_button_border =
-      new views::LabelButtonBorder(search_button_->style());
+  scoped_ptr<views::LabelButtonBorder> search_button_border(
+      new views::LabelButtonBorder(search_button_->style()));
   search_button_border->set_insets(gfx::Insets());
   const int kSearchButtonNormalImages[] = IMAGE_GRID(IDR_OMNIBOX_SEARCH_BUTTON);
   search_button_border->SetPainter(
       false, views::Button::STATE_NORMAL,
       views::Painter::CreateImageGridPainter(kSearchButtonNormalImages));
   const int kSearchButtonHoveredImages[] =
       IMAGE_GRID(IDR_OMNIBOX_SEARCH_BUTTON_HOVER);
   search_button_border->SetPainter(
       false, views::Button::STATE_HOVERED,
       views::Painter::CreateImageGridPainter(kSearchButtonHoveredImages));
   const int kSearchButtonPressedImages[] =
       IMAGE_GRID(IDR_OMNIBOX_SEARCH_BUTTON_PRESSED);
   search_button_border->SetPainter(
       false, views::Button::STATE_PRESSED,
       views::Painter::CreateImageGridPainter(kSearchButtonPressedImages));
   search_button_border->SetPainter(false, views::Button::STATE_DISABLED, NULL);
   search_button_border->SetPainter(true, views::Button::STATE_NORMAL, NULL);
   search_button_border->SetPainter(true, views::Button::STATE_HOVERED, NULL);
   search_button_border->SetPainter(true, views::Button::STATE_PRESSED, NULL);
   search_button_border->SetPainter(true, views::Button::STATE_DISABLED, NULL);
-  search_button_->set_border(search_button_border);
+  search_button_->SetBorder(search_button_border.PassAs<views::Border>());
   const int kSearchButtonWidth = 56;
   search_button_->set_min_size(gfx::Size(kSearchButtonWidth, 0));
   search_button_->SetVisible(false);
   AddChildView(search_button_);
 
   content::Source<Profile> profile_source = content::Source<Profile>(profile());
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
                  profile_source);
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, profile_source);
@@ skipping 467 matching lines @@
         // TODO(sky): Figure out why we need the +1.
         suggested_text_bounds.set_x(location_bounds.x() + 1);
         // Use a margin to prevent omnibox text from overlapping suggest text.
         omnibox_view_margin = suggested_text_bounds.width();
       }
       suggested_text_view_->SetBoundsRect(suggested_text_bounds);
     }
   }
 
   const gfx::Insets insets = omnibox_view_->GetInsets();
-  omnibox_view_->set_border(views::Border::CreateEmptyBorder(
+  omnibox_view_->SetBorder(views::Border::CreateEmptyBorder(
       insets.top(), insets.left(), insets.bottom(), omnibox_view_margin));
 
   // Layout |ime_inline_autocomplete_view_| next to the user input.
   if (ime_inline_autocomplete_view_->visible()) {
     int width =
         gfx::GetStringWidth(ime_inline_autocomplete_view_->text(),
                             ime_inline_autocomplete_view_->font_list()) +
         ime_inline_autocomplete_view_->GetInsets().width();
     // All the target languages (IMEs) are LTR, and we do not need to support
     // RTL so far.  In other words, no testable RTL environment so far.
@@ skipping 636 matching lines @@
     bounds.Inset(-(horizontal_padding + 1) / 2, 0);
     location_bar_util::PaintExtensionActionBackground(
         *(*page_action_view)->image_view()->page_action(),
         tab_id, canvas, bounds, text_color, background_color);
   }
 }
 
 void LocationBarView::AccessibilitySetValue(const base::string16& new_value) {
   omnibox_view_->SetUserText(new_value, new_value, true);
 }