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

ash/system/session_length_limit/tray_session_length_limit.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/session_length_limit/tray_session_length_limit.h"
 
 #include <algorithm>
 
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
@@ skipping 104 matching lines @@
 class RemainingSessionTimeTrayView : public views::View {
  public:
   RemainingSessionTimeTrayView(const TraySessionLengthLimit* owner,
                                ShelfAlignment shelf_alignment);
   virtual ~RemainingSessionTimeTrayView();
 
   void UpdateClockLayout(ShelfAlignment shelf_alignment);
   void Update();
 
  private:
-  void SetBorder(ShelfAlignment shelf_alignment);
+  void SetBorderFromAlignment(ShelfAlignment shelf_alignment);
 
   const TraySessionLengthLimit* owner_;
 
   views::Label* horizontal_layout_label_;
   views::Label* vertical_layout_label_hours_left_;
   views::Label* vertical_layout_label_hours_right_;
   views::Label* vertical_layout_label_minutes_left_;
   views::Label* vertical_layout_label_minutes_right_;
   views::Label* vertical_layout_label_seconds_left_;
   views::Label* vertical_layout_label_seconds_right_;
@@ skipping 13 matching lines @@
       vertical_layout_label_seconds_left_(NULL),
       vertical_layout_label_seconds_right_(NULL) {
   UpdateClockLayout(shelf_alignment);
 }
 
 RemainingSessionTimeTrayView::~RemainingSessionTimeTrayView() {
 }
 
 void RemainingSessionTimeTrayView::UpdateClockLayout(
     ShelfAlignment shelf_alignment) {
-  SetBorder(shelf_alignment);
+  SetBorderFromAlignment(shelf_alignment);
   const bool horizontal_layout = (shelf_alignment == SHELF_ALIGNMENT_BOTTOM ||
       shelf_alignment == SHELF_ALIGNMENT_TOP);
   if (horizontal_layout && !horizontal_layout_label_) {
     // Remove labels used for vertical layout.
     RemoveAllChildViews(true);
     vertical_layout_label_hours_left_ = NULL;
     vertical_layout_label_hours_right_ = NULL;
     vertical_layout_label_minutes_left_ = NULL;
     vertical_layout_label_minutes_right_ = NULL;
     vertical_layout_label_seconds_left_ = NULL;
@@ skipping 85 matching lines @@
     vertical_layout_label_minutes_left_->SetEnabledColor(color);
     vertical_layout_label_minutes_right_->SetEnabledColor(color);
     vertical_layout_label_seconds_left_->SetEnabledColor(color);
     vertical_layout_label_seconds_right_->SetEnabledColor(color);
   }
 
   Layout();
   SetVisible(true);
 }
 
-void RemainingSessionTimeTrayView::SetBorder(ShelfAlignment shelf_alignment) {
+void RemainingSessionTimeTrayView::SetBorderFromAlignment(
+    ShelfAlignment shelf_alignment) {
   if (shelf_alignment == SHELF_ALIGNMENT_BOTTOM ||
       shelf_alignment == SHELF_ALIGNMENT_TOP) {
-    set_border(views::Border::CreateEmptyBorder(
-        0, kTrayLabelItemHorizontalPaddingBottomAlignment,
-        0, kTrayLabelItemHorizontalPaddingBottomAlignment));
+    SetBorder(views::Border::CreateEmptyBorder(
+        0,
+        kTrayLabelItemHorizontalPaddingBottomAlignment,
+        0,
+        kTrayLabelItemHorizontalPaddingBottomAlignment));
   } else {
-    set_border(NULL);
+    SetBorder(views::Border::NullBorder());
   }
 }
 
 }  // namespace tray
 
 // static
 const char TraySessionLengthLimit::kNotificationId[] =
     "chrome://session/timeout";
 
 TraySessionLengthLimit::TraySessionLengthLimit(SystemTray* system_tray)
@@ skipping 94 matching lines @@
   if (tray_view_)
     tray_view_->Update();
 }
 
 bool TraySessionLengthLimit::IsTrayViewVisibleForTest() {
   return tray_view_ && tray_view_->visible();
 }
 
 }  // namespace internal
 }  // namespace ash