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

ash/system/tray/special_popup_row.cc

 // Copyright (c) 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 "ash/system/tray/special_popup_row.h"
 
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/throbber_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_header_button.h"
@@ skipping 14 matching lines @@
 
 const int kIconPaddingLeft = 5;
 const int kSpecialPopupRowHeight = 55;
 const int kBorderHeight = 1;
 const SkColor kBorderColor = SkColorSetRGB(0xaa, 0xaa, 0xaa);
 
 views::View* CreatePopupHeaderButtonsContainer() {
   views::View* view = new views::View;
   view->SetLayoutManager(new
       views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, -1));
-  view->set_border(views::Border::CreateEmptyBorder(0, 0, 0, 5));
+  view->SetBorder(views::Border::CreateEmptyBorder(0, 0, 0, 5));
   return view;
 }
 
 }  // namespace
 
 SpecialPopupRow::SpecialPopupRow()
     : content_(NULL),
       button_container_(NULL) {
   set_background(views::Background::CreateSolidBackground(
       kHeaderBackgroundColor));
-  set_border(views::Border::CreateSolidSidedBorder(
+  SetBorder(views::Border::CreateSolidSidedBorder(
       kBorderHeight, 0, 0, 0, kBorderColor));
   SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 }
 
 SpecialPopupRow::~SpecialPopupRow() {
 }
 
 void SpecialPopupRow::SetTextLabel(int string_id, ViewClickListener* listener) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   HoverHighlightView* container = new HoverHighlightView(listener);
   container->SetLayoutManager(new
       views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3, kIconPaddingLeft));
 
   container->set_highlight_color(SkColorSetARGB(0, 0, 0, 0));
   container->set_default_color(SkColorSetARGB(0, 0, 0, 0));
   container->set_text_highlight_color(kHeaderTextColorHover);
   container->set_text_default_color(kHeaderTextColorNormal);
 
   container->AddIconAndLabel(
       *rb.GetImageNamed(IDR_AURA_UBER_TRAY_LESS).ToImageSkia(),
       rb.GetLocalizedString(string_id),
       gfx::Font::BOLD);
 
-  container->set_border(views::Border::CreateEmptyBorder(0,
-      kTrayPopupPaddingHorizontal, 0, 0));
+  container->SetBorder(
+      views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
 
   container->SetAccessibleName(
       rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_PREVIOUS_MENU));
   SetContent(container);
 }
 
 void SpecialPopupRow::SetContent(views::View* view) {
   CHECK(!content_);
   content_ = view;
   AddChildViewAt(content_, 0);
@@ skipping 42 matching lines @@
   container_bounds.set_x(content_bounds.width() - container_bounds.width());
   button_container_->SetBoundsRect(container_bounds);
 
   bounds = content_->bounds();
   bounds.set_width(button_container_->x());
   content_->SetBoundsRect(bounds);
 }
 
 }  // namespace internal
 }  // namespace ash