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

ash/system/date/date_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/date/date_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_utils.h"
@@ skipping 230 matching lines @@
 bool TimeView::PerformAction(const ui::Event& event) {
   return false;
 }
 
 bool TimeView::OnMousePressed(const ui::MouseEvent& event) {
   // Let the event fall through.
   return false;
 }
 
 void TimeView::UpdateClockLayout(TrayDate::ClockLayout clock_layout){
-  SetBorder(clock_layout);
+  SetBorderFromLayout(clock_layout);
   if (clock_layout == TrayDate::HORIZONTAL_CLOCK) {
     RemoveChildView(vertical_label_hours_.get());
     RemoveChildView(vertical_label_minutes_.get());
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
     AddChildView(horizontal_label_.get());
   } else {
     RemoveChildView(horizontal_label_.get());
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
     const int kColumnId = 0;
     views::ColumnSet* columns = layout->AddColumnSet(kColumnId);
     columns->AddPaddingColumn(0, kVerticalClockLeftPadding);
     columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                        0, views::GridLayout::USE_PREF, 0, 0);
     layout->AddPaddingRow(0, kTrayLabelItemVerticalPaddingVerticalAlignment);
     layout->StartRow(0, kColumnId);
     layout->AddView(vertical_label_hours_.get());
     layout->StartRow(0, kColumnId);
     layout->AddView(vertical_label_minutes_.get());
     layout->AddPaddingRow(0, kTrayLabelItemVerticalPaddingVerticalAlignment);
   }
   Layout();
 }
 
-void TimeView::SetBorder(TrayDate::ClockLayout clock_layout) {
+void TimeView::SetBorderFromLayout(TrayDate::ClockLayout clock_layout) {
   if (clock_layout == TrayDate::HORIZONTAL_CLOCK)
-    set_border(views::Border::CreateEmptyBorder(
+    SetBorder(views::Border::CreateEmptyBorder(
         0, kTrayLabelItemHorizontalPaddingBottomAlignment,
         0, kTrayLabelItemHorizontalPaddingBottomAlignment));
   else
-    set_border(NULL);
+    ClearBorder();
 }
 
 void TimeView::SetupLabels() {
   horizontal_label_.reset(CreateLabel());
   SetupLabel(horizontal_label_.get());
   vertical_label_hours_.reset(CreateLabel());
   SetupLabel(vertical_label_hours_.get());
   vertical_label_minutes_.reset(CreateLabel());
   SetupLabel(vertical_label_minutes_.get());
   vertical_label_minutes_->SetEnabledColor(kVerticalClockMinuteColor);
   // Pull the minutes up closer to the hours by using a negative top border.
-  vertical_label_minutes_->set_border(
+  vertical_label_minutes_->SetBorder(
       views::Border::CreateEmptyBorder(
           kVerticalClockMinutesTopOffset, 0, 0, 0));
 }
 
 void TimeView::SetupLabel(views::Label* label) {
   label->set_owned_by_client();
   SetupLabelForTray(label);
   label->SetFontList(label->font_list().DeriveFontListWithSizeDeltaAndStyle(
       0, label->font_list().GetFontStyle() & ~gfx::Font::BOLD));
 }
 
 }  // namespace tray
 }  // namespace internal
 }  // namespace ash