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

chrome/browser/ui/views/profile_chooser_view.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 "chrome/browser/ui/views/profile_chooser_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 101 matching lines @@
 BackgroundColorHoverButton::BackgroundColorHoverButton(
     views::ButtonListener* listener,
     const base::string16& text,
     const gfx::ImageSkia& normal_icon,
     const gfx::ImageSkia& hover_icon)
     : views::TextButton(listener, text) {
   scoped_ptr<views::TextButtonBorder> text_button_border(
       new views::TextButtonBorder());
   text_button_border->SetInsets(gfx::Insets(0, views::kButtonHEdgeMarginNew,
                                             0, views::kButtonHEdgeMarginNew));
-  set_border(text_button_border.release());
+  SetBorder(text_button_border.PassAs<views::Border>());
   set_min_height(kButtonHeight);
   set_icon_text_spacing(views::kItemLabelSpacing);
   SetIcon(normal_icon);
   SetHoverIcon(hover_icon);
   SetPushedIcon(hover_icon);
   SetHoverColor(GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor));
   OnHighlightStateChanged();
 }
 
@@ skipping 45 matching lines @@
 
     if (!is_editing_allowed)
       return;
 
     set_notify_enter_exit_on_child(true);
 
     // Button overlay that appears when hovering over the image.
     change_photo_button_ = new views::TextButton(listener,
         l10n_util::GetStringUTF16(IDS_PROFILES_PROFILE_CHANGE_PHOTO_BUTTON));
     change_photo_button_->set_alignment(views::TextButton::ALIGN_CENTER);
-    change_photo_button_->set_border(NULL);
+    change_photo_button_->SetBorder(views::Border::NullBorder());
     change_photo_button_->SetEnabledColor(SK_ColorWHITE);
     change_photo_button_->SetHoverColor(SK_ColorWHITE);
 
     change_photo_button_->set_background(
         views::Background::CreateSolidBackground(kBackgroundColor));
     // Need to take in account the border padding on the avatar.
     change_photo_button_->SetBounds(
         profiles::kAvatarIconPadding,
         kLargeImageSide - kOverlayHeight,
         kLargeImageSide - profiles::kAvatarIconPadding,
@@ skipping 34 matching lines @@
  public:
   EditableProfileName(views::TextfieldController* controller,
                       const base::string16& text,
                       bool is_editing_allowed)
       : views::TextButton(this, text),
         profile_name_textfield_(NULL) {
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     const gfx::FontList& medium_font_list =
         rb->GetFontList(ui::ResourceBundle::MediumFont);
     SetFontList(medium_font_list);
-    set_border(NULL);
+    SetBorder(views::Border::NullBorder());
 
     if (!is_editing_allowed)
       return;
 
     SetHoverIcon(*rb->GetImageSkiaNamed(IDR_ICON_PROFILES_EDIT_HOVER));
     SetPushedIcon(*rb->GetImageSkiaNamed(IDR_ICON_PROFILES_EDIT_PRESSED));
     set_icon_placement(views::TextButton::ICON_ON_RIGHT);
     set_full_justification(true);
 
     // Textfield that overlaps the button.
@@ skipping 461 matching lines @@
         item.icon, true,
         kSmallImageSide + profiles::kAvatarIconPadding,
         kSmallImageSide + profiles::kAvatarIconPadding);
 
     views::TextButton* button = new views::TextButton(this, item.name);
     open_other_profile_indexes_map_[button] = index;
     button->SetIcon(*image.ToImageSkia());
     button->set_icon_text_spacing(views::kItemLabelSpacing);
     button->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
         ui::ResourceBundle::MediumFont));
-    button->set_border(NULL);
+    button->SetBorder(views::Border::NullBorder());
 
     layout->StartRow(1, 0);
     layout->AddView(button);
 
     // The last avatar in the list does not need any bottom padding.
     if (i < num_avatars_to_show - 1)
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   return view;
@@ skipping 88 matching lines @@
   // Use a MenuButtonListener and not a regular ButtonListener to be
   // able to distinguish between the unnamed "other profile" buttons and the
   // unnamed "multiple accounts" buttons.
   views::MenuButton* email_button = new views::MenuButton(
       NULL,
       gfx::ElideEmail(base::UTF8ToUTF16(account),
                       rb->GetFontList(ui::ResourceBundle::BaseFont),
                       width()),
       is_primary_account ? NULL : this,  // Cannot delete the primary account.
       !is_primary_account);
-  email_button->set_border(views::Border::CreateEmptyBorder(0, 0, 0, 0));
+  email_button->SetBorder(views::Border::CreateEmptyBorder(0, 0, 0, 0));
   if (!is_primary_account) {
     email_button->set_menu_marker(
         rb->GetImageNamed(IDR_CLOSE_1).ToImageSkia());
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
   layout->StartRow(1, 0);
   layout->AddView(email_button);
 
   // Save the original email address, as the button text could be elided.
   current_profile_accounts_map_[email_button] = account;
 }