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

ash/system/logout_button/logout_button_tray.cc

 // Copyright 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/logout_button/logout_button_tray.h"
 
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 70 matching lines @@
 }  // namespace
 
 LogoutButton::LogoutButton(views::ButtonListener* listener)
     : views::LabelButton(listener, base::string16()) {
   SetupLabelForTray(label());
   SetFontList(
       GetFontList().DeriveFontListWithSizeDeltaAndStyle(0, gfx::Font::NORMAL));
   for (size_t state = 0; state < views::Button::STATE_COUNT; ++state)
     SetTextColor(static_cast<views::Button::ButtonState>(state), SK_ColorWHITE);
 
-  views::LabelButtonBorder* border =
-      new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON);
+  scoped_ptr<views::LabelButtonBorder> border(
+      new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON));
   border->SetPainter(false, views::Button::STATE_NORMAL,
       views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
   border->SetPainter(false, views::Button::STATE_HOVERED,
       views::Painter::CreateImageGridPainter(kLogoutButtonNormalImages));
   border->SetPainter(false, views::Button::STATE_PRESSED,
       views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages));
   gfx::Insets insets = border->GetInsets();
   insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding,
                         0, kLogoutButtonHorizontalExtraPadding);
   border->set_insets(insets);
-  set_border(border);
+  SetBorder(border.PassAs<views::Border>());
   set_animate_on_state_change(false);
 
   set_min_size(gfx::Size(0, GetShelfItemHeight()));
 }
 
 LogoutButton::~LogoutButton() {
 }
 
 void LogoutConfirmationDialogDelegate::LogoutCurrentUser() {
   Shell::GetInstance()->system_tray_delegate()->SignOut();
@@ skipping 12 matching lines @@
 
 LogoutButtonTray::LogoutButtonTray(StatusAreaWidget* status_area_widget)
     : TrayBackgroundView(status_area_widget),
       button_(NULL),
       login_status_(user::LOGGED_IN_NONE),
       show_logout_button_in_tray_(false),
       confirmation_dialog_(NULL),
       confirmation_delegate_(new LogoutConfirmationDialogDelegate) {
   button_ = new LogoutButton(this);
   tray_container()->AddChildView(button_);
-  tray_container()->set_border(NULL);
+  tray_container()->SetBorder(views::Border::NullBorder());
   // The Shell may not exist in some unit tests.
   if (Shell::HasInstance()) {
     Shell::GetInstance()->system_tray_notifier()->
         AddLogoutButtonObserver(this);
   }
 }
 
 LogoutButtonTray::~LogoutButtonTray() {
   EnsureConfirmationDialogIsClosed();
   // The Shell may not exist in some unit tests.
@@ skipping 15 matching lines @@
   }
 }
 
 void LogoutButtonTray::EnsureConfirmationDialogIsClosed() {
   if (confirmation_dialog_)
     confirmation_dialog_->Close();
 }
 
 void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
-  tray_container()->set_border(NULL);
+  tray_container()->SetBorder(views::Border::NullBorder());
 }
 
 base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
   return button_->GetText();
 }
 
 void LogoutButtonTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {
 }
 
@@ skipping 44 matching lines @@
 void LogoutButtonTray::UpdateVisibility() {
   SetVisible(show_logout_button_in_tray_ &&
              login_status_ != user::LOGGED_IN_NONE &&
              login_status_ != user::LOGGED_IN_LOCKED);
   if (!show_logout_button_in_tray_)
     EnsureConfirmationDialogIsClosed();
 }
 
 }  // namespace internal
 }  // namespace ash