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

ash/system/tray/tray_background_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 "ash/system/tray/tray_background_view.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 266 matching lines @@
   // Adjust the size of status tray dark background by adding additional
   // empty border.
   if (alignment_ == SHELF_ALIGNMENT_BOTTOM ||
       alignment_ == SHELF_ALIGNMENT_TOP) {
     int vertical_padding = kTrayContainerVerticalPaddingBottomAlignment;
     int horizontal_padding = kTrayContainerHorizontalPaddingBottomAlignment;
     if (ash::switches::UseAlternateShelfLayout()) {
       vertical_padding = kPaddingFromEdgeOfShelf;
       horizontal_padding = kPaddingFromEdgeOfShelf;
     }
-    set_border(views::Border::CreateEmptyBorder(
+    SetBorder(views::Border::CreateEmptyBorder(
         vertical_padding,
         horizontal_padding,
         vertical_padding,
         horizontal_padding));
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
     layout->set_spread_blank_space(true);
     views::View::SetLayoutManager(layout);
   } else {
     int vertical_padding = kTrayContainerVerticalPaddingVerticalAlignment;
     int horizontal_padding = kTrayContainerHorizontalPaddingVerticalAlignment;
     if (ash::switches::UseAlternateShelfLayout()) {
       vertical_padding = kPaddingFromEdgeOfShelf;
       horizontal_padding = kPaddingFromEdgeOfShelf;
     }
-    set_border(views::Border::CreateEmptyBorder(
+    SetBorder(views::Border::CreateEmptyBorder(
         vertical_padding,
         horizontal_padding,
         vertical_padding,
         horizontal_padding));
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
     layout->set_spread_blank_space(true);
     views::View::SetLayoutManager(layout);
   }
@@ skipping 28 matching lines @@
   tray_event_filter_.reset(new TrayEventFilter);
 }
 
 TrayBackgroundView::~TrayBackgroundView() {
   if (GetWidget())
     GetWidget()->RemoveObserver(widget_observer_.get());
 }
 
 void TrayBackgroundView::Initialize() {
   GetWidget()->AddObserver(widget_observer_.get());
-  SetBorder();
+  SetTrayBorder();
 }
 
 const char* TrayBackgroundView::GetClassName() const {
   return kViewClassName;
 }
 
 void TrayBackgroundView::OnMouseEntered(const ui::MouseEvent& event) {
   hovered_ = true;
   if (!background_ || draw_background_as_active_ ||
       ash::switches::UseAlternateShelfLayout())
@@ skipping 63 matching lines @@
   background_ = new internal::TrayBackground(this);
   tray_container_->set_background(background_);
 }
 
 ShelfLayoutManager* TrayBackgroundView::GetShelfLayoutManager() {
   return ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
 }
 
 void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
   shelf_alignment_ = alignment;
-  SetBorder();
+  SetTrayBorder();
   tray_container_->SetAlignment(alignment);
 }
 
-void TrayBackgroundView::SetBorder() {
+void TrayBackgroundView::SetTrayBorder() {
   views::View* parent = status_area_widget_->status_area_widget_delegate();
   // Tray views are laid out right-to-left or bottom-to-top
   bool on_edge = (this == parent->child_at(0));
   int left_edge, top_edge, right_edge, bottom_edge;
   if (ash::switches::UseAlternateShelfLayout()) {
     if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
       top_edge = ShelfLayoutManager::kShelfItemInset;
       left_edge = 0;
       bottom_edge = ShelfLayoutManager::GetPreferredShelfSize() -
           ShelfLayoutManager::kShelfItemInset - GetShelfItemHeight();
@@ skipping 30 matching lines @@
       left_edge = kPaddingFromOuterEdgeOfLauncherVerticalAlignment;
       bottom_edge = on_edge ? kPaddingFromBottomOfScreenVerticalAlignment : 0;
       right_edge = kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
     } else {
       top_edge = 0;
       left_edge = kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
       bottom_edge = on_edge ? kPaddingFromBottomOfScreenVerticalAlignment : 0;
       right_edge = kPaddingFromOuterEdgeOfLauncherVerticalAlignment;
     }
   }
-  set_border(views::Border::CreateEmptyBorder(
+  SetBorder(views::Border::CreateEmptyBorder(
       top_edge, left_edge, bottom_edge, right_edge));
 }
 
 void TrayBackgroundView::InitializeBubbleAnimations(
     views::Widget* bubble_widget) {
   views::corewm::SetWindowVisibilityAnimationType(
       bubble_widget->GetNativeWindow(),
       views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
   views::corewm::SetWindowVisibilityAnimationTransition(
       bubble_widget->GetNativeWindow(),
@@ skipping 122 matching lines @@
   ash::internal::ShelfLayoutManager* shelf =
       ShelfLayoutManager::ForShelf(root_window);
   bubble_view->SetArrowPaintType(
       (shelf && shelf->IsVisible()) ?
       views::BubbleBorder::PAINT_NORMAL :
       views::BubbleBorder::PAINT_TRANSPARENT);
 }
 
 }  // namespace internal
 }  // namespace ash