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

ash/system/date/date_view.h

 // 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.
 
 #ifndef ASH_SYSTEM_DATE_DATE_VIEW_H_
 #define ASH_SYSTEM_DATE_DATE_VIEW_H_
 
 #include "ash/ash_export.h"
 #include "ash/system/date/tray_date.h"
 #include "ash/system/tray/actionable_view.h"
@@ skipping 92 matching lines @@
 
   // Overridden from BaseDateTimeView.
   virtual void UpdateTextInternal(const base::Time& now) OVERRIDE;
 
   // Overridden from ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
 
-  void SetBorder(TrayDate::ClockLayout clock_layout);
+  void SetBorderFromLayout(TrayDate::ClockLayout clock_layout);
   void SetupLabels();
   void SetupLabel(views::Label* label);
 
   // Label text used for the normal horizontal shelf.
   scoped_ptr<views::Label> horizontal_label_;
 
   // The time label is split into two lines for the vertical shelf.
   scoped_ptr<views::Label> vertical_label_hours_;
   scoped_ptr<views::Label> vertical_label_minutes_;
 
   base::HourClockType hour_type_;
 
   DISALLOW_COPY_AND_ASSIGN(TimeView);
 };
 
 }  // namespace tray
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_DATE_DATE_VIEW_H_