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

ash/system/user/tray_user.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/user/tray_user.h"
 
 #include <algorithm>
 #include <climits>
 #include <vector>
 
@@ skipping 455 matching lines @@
     event->SetHandled();
   }
 }
 
 PublicAccountUserDetails::PublicAccountUserDetails(SystemTrayItem* owner,
                                                    int used_width)
     : learn_more_(NULL) {
   const int inner_padding =
       kTrayPopupPaddingHorizontal - kTrayPopupPaddingBetweenItems;
   const bool rtl = base::i18n::IsRTL();
-  set_border(views::Border::CreateEmptyBorder(
+  SetBorder(views::Border::CreateEmptyBorder(
       kUserDetailsVerticalPadding, rtl ? 0 : inner_padding,
       kUserDetailsVerticalPadding, rtl ? inner_padding : 0));
 
   // Retrieve the user's display name and wrap it with markers.
   // Note that since this is a public account it always has to be the primary
   // user.
   base::string16 display_name =
       Shell::GetInstance()->session_state_delegate()->GetUserDisplayName(0);
   base::RemoveChars(display_name, kDisplayNameMark, &display_name);
   display_name = kDisplayNameMark[0] + display_name + kDisplayNameMark[0];
@@ skipping 189 matching lines @@
 void UserCard::OnMouseExited(const ui::MouseEvent& event) {
   if (is_active_user_) {
     button_hovered_ = false;
     background()->SetNativeControlColor(kBackgroundColor);
     ShowActive();
   }
 }
 
 void UserCard::ShowActive() {
   int width = button_hovered_ || show_border_ ? 1 : 0;
-  set_border(views::Border::CreateSolidSidedBorder(width, width, width, 1,
+  SetBorder(views::Border::CreateSolidSidedBorder(width, width, width, 1,
                                                    kBorderColor));
   SchedulePaint();
 }
 
 UserView::UserView(SystemTrayItem* owner,
                    user::LoginStatus login,
                    MultiProfileIndex index)
     : multiprofile_index_(index),
       user_card_view_(NULL),
       owner_(owner),
@@ skipping 128 matching lines @@
 }
 
 void UserView::AddLogoutButton(user::LoginStatus login) {
   const base::string16 title = user::GetLocalizedSignOutStringForStatus(login,
                                                                         true);
   TrayPopupLabelButton* logout_button = new TrayPopupLabelButton(this, title);
   logout_button->SetAccessibleName(title);
   logout_button_ = logout_button;
   // In public account mode, the logout button border has a custom color.
   if (login == user::LOGGED_IN_PUBLIC) {
-    TrayPopupLabelButtonBorder* border = new TrayPopupLabelButtonBorder();
+    scoped_ptr<TrayPopupLabelButtonBorder> border(
+        new TrayPopupLabelButtonBorder());
     border->SetPainter(false, views::Button::STATE_NORMAL,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesNormal));
     border->SetPainter(false, views::Button::STATE_HOVERED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
     border->SetPainter(false, views::Button::STATE_PRESSED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
-    logout_button_->set_border(border);
+    logout_button_->SetBorder(border.PassAs<views::Border>());
   }
   AddChildView(logout_button_);
 }
 
 void UserView::AddUserCard(SystemTrayItem* owner, user::LoginStatus login) {
   // Add padding around the panel.
-  set_border(views::Border::CreateEmptyBorder(
+  SetBorder(views::Border::CreateEmptyBorder(
       kUserCardVerticalPadding, kTrayPopupPaddingHorizontal,
       kUserCardVerticalPadding, kTrayPopupPaddingHorizontal));
 
   if (SupportsMultiProfile() && login != user::LOGGED_IN_RETAIL_MODE) {
     user_card_view_ = new UserCard(this, multiprofile_index_ == 0);
     is_user_card_ = true;
   } else {
     user_card_view_ = new views::View();
     is_user_card_ = false;
   }
@@ skipping 15 matching lines @@
     AddLoggedInPublicModeUserCardContent(owner);
     return;
   }
 
   views::View* icon = CreateIconForUserCard(login);
   user_card_view_->AddChildView(icon);
 
   // To allow the border to start before the icon, reduce the size before and
   // add an inset to the icon to get the spacing.
   if (multiprofile_index_ == 0 && SupportsMultiProfile()) {
-    icon->set_border(views::Border::CreateEmptyBorder(
+    icon->SetBorder(views::Border::CreateEmptyBorder(
         0, kTrayUserTileHoverBorderInset, 0, 0));
-    set_border(views::Border::CreateEmptyBorder(
+    SetBorder(views::Border::CreateEmptyBorder(
         kUserCardVerticalPadding,
         kTrayPopupPaddingHorizontal - kTrayUserTileHoverBorderInset,
         kUserCardVerticalPadding,
         kTrayPopupPaddingHorizontal));
   }
   SessionStateDelegate* delegate =
       Shell::GetInstance()->session_state_delegate();
   views::Label* username = NULL;
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   if (!multiprofile_index_) {
@@ skipping 63 matching lines @@
         gfx::Size(kUserIconSize, kUserIconSize));
   }
   return icon;
 }
 
 void UserView::AddLoggedInRetailModeUserCardContent() {
   views::Label* details = new views::Label;
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   details->SetText(
       bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_KIOSK_LABEL));
-  details->set_border(views::Border::CreateEmptyBorder(0, 4, 0, 1));
+  details->SetBorder(views::Border::CreateEmptyBorder(0, 4, 0, 1));
   details->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   user_card_view_->AddChildView(details);
 }
 
 void UserView::AddLoggedInPublicModeUserCardContent(SystemTrayItem* owner) {
   user_card_view_->AddChildView(CreateIconForUserCard(user::LOGGED_IN_PUBLIC));
   user_card_view_->AddChildView(new PublicAccountUserDetails(
       owner, GetPreferredSize().width() + kTrayPopupPaddingBetweenItems));
 }
 
@@ skipping 105 matching lines @@
 
   const SessionStateDelegate* delegate =
       Shell::GetInstance()->session_state_delegate();
   bool enable = delegate->NumberOfLoggedInUsers() <
                     delegate->GetMaximumNumberOfLoggedInUsers();
 
   SetLayoutManager(new views::FillLayout());
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
   // Add padding around the panel.
-  set_border(views::Border::CreateSolidBorder(1, kBorderColor));
+  SetBorder(views::Border::CreateSolidBorder(1, kBorderColor));
 
   add_user_ = new UserCard(this, enable);
-  add_user_->set_border(views::Border::CreateEmptyBorder(
+  add_user_->SetBorder(views::Border::CreateEmptyBorder(
       kUserCardVerticalPadding,
       kTrayPopupPaddingHorizontal- kTrayUserTileHoverBorderInset,
       kUserCardVerticalPadding,
       kTrayPopupPaddingHorizontal- kTrayUserTileHoverBorderInset));
 
   add_user_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0 , kTrayPopupPaddingBetweenItems));
   AddChildViewAt(add_user_, 0);
 
   // Add the [+] icon which is also the anchor for messages.
@@ skipping 169 matching lines @@
   if (status == user::LOGGED_IN_LOCALLY_MANAGED) {
     label_->SetText(
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL));
   } else if (status == user::LOGGED_IN_GUEST) {
     label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
   }
 
   if (avatar_ && switches::UseAlternateShelfLayout()) {
     int corner_radius = GetTrayItemRadius();
     avatar_->SetCornerRadii(0, corner_radius, corner_radius, 0);
-    avatar_->set_border(NULL);
+    avatar_->ClearBorder();
   }
   UpdateAvatarImage(status);
 
   // Update layout after setting label_ and avatar_ with new login status.
   UpdateLayoutOfItem();
 }
 
 void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   // Inactive users won't have a layout.
   if (!layout_view_)
     return;
   int corner_radius = GetTrayItemRadius();
   if (alignment == SHELF_ALIGNMENT_BOTTOM ||
       alignment == SHELF_ALIGNMENT_TOP) {
     if (avatar_) {
       if (switches::UseAlternateShelfLayout()) {
         if (multiprofile_index_) {
-          avatar_->set_border(
+          avatar_->SetBorder(
               views::Border::CreateEmptyBorder(0, kTrayLabelSpacing, 0, 0));
         } else {
-          avatar_->set_border(NULL);
+          avatar_->ClearBorder();
         }
         avatar_->SetCornerRadii(0, corner_radius, corner_radius, 0);
       } else {
-        avatar_->set_border(views::Border::CreateEmptyBorder(
+        avatar_->SetBorder(views::Border::CreateEmptyBorder(
             0, kTrayImageItemHorizontalPaddingBottomAlignment + 2,
             0, kTrayImageItemHorizontalPaddingBottomAlignment));
       }
     }
     if (label_) {
-      label_->set_border(views::Border::CreateEmptyBorder(
+      label_->SetBorder(views::Border::CreateEmptyBorder(
           0, kTrayLabelItemHorizontalPaddingBottomAlignment,
           0, kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
     layout_view_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal,
                              0, 0, kUserLabelToIconPadding));
   } else {
     if (avatar_) {
       if (switches::UseAlternateShelfLayout()) {
         if (multiprofile_index_) {
-          avatar_->set_border(
+          avatar_->SetBorder(
               views::Border::CreateEmptyBorder(kTrayLabelSpacing, 0, 0, 0));
         } else {
-          avatar_->set_border(NULL);
+          avatar_->ClearBorder();
         }
         avatar_->SetCornerRadii(0, 0, corner_radius, corner_radius);
       } else {
         SetTrayImageItemBorder(avatar_, alignment);
       }
     }
     if (label_) {
-      label_->set_border(views::Border::CreateEmptyBorder(
+      label_->SetBorder(views::Border::CreateEmptyBorder(
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment,
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
     layout_view_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical,
                              0, 0, kUserLabelToIconPadding));
   }
 }
@@ skipping 61 matching lines @@
       internal::GetRootWindowController(
           system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
   if (controller && controller->shelf()) {
     UpdateAfterShelfAlignmentChange(
         controller->GetShelfLayoutManager()->GetAlignment());
   }
 }
 
 }  // namespace internal
 }  // namespace ash