Remove unnecessary Border subclasses where we can achieve the same functionality

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/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_util.h"
@@ skipping 69 matching lines @@
 views::Link* CreateLink(const base::string16& link_text,
                         views::LinkListener* listener) {
   views::Link* link_button = new views::Link(link_text);
   link_button->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   link_button->SetUnderline(false);
   link_button->set_listener(listener);
   return link_button;
 }
 
 
-// HorizontalPaddingButtonBorder ----------------------------------------------
-
-// A button border that adds padding before the icon and after the text. This
-// is needed so that the button looks like it is spanning the entire parent
-// view (especially when hovered over), but has the icon indented and aligned
-// with the other items in the parent view.
-class HorizontalPaddingButtonBorder : public views::TextButtonBorder {
- public:
-  HorizontalPaddingButtonBorder() : views::TextButtonBorder() {
-    SetInsets(gfx::Insets(0, views::kButtonHEdgeMarginNew,
-                          0, views::kButtonHEdgeMarginNew));
-  };
-
-  virtual ~HorizontalPaddingButtonBorder() {
-  };
-
- private:
-  // This function is pure virtual in the parent, so we must provide an
-  // implementation.
-  virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE {
-  };
-
-  DISALLOW_COPY_AND_ASSIGN(HorizontalPaddingButtonBorder);
-};
-
-
 // BackgroundColorHoverButton -------------------------------------------------
 
 // A custom button that allows for setting a background color when hovered over.
 class BackgroundColorHoverButton : public views::TextButton {
  public:
   BackgroundColorHoverButton(views::ButtonListener* listener,
                              const base::string16& text,
                              const gfx::ImageSkia& normal_icon,
                              const gfx::ImageSkia& hover_icon);
   virtual ~BackgroundColorHoverButton();
 
  private:
   // views::TextButton:
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
 
   void OnHighlightStateChanged();
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundColorHoverButton);
 };
 
 BackgroundColorHoverButton::BackgroundColorHoverButton(
     views::ButtonListener* listener,
     const string16& text,
     const gfx::ImageSkia& normal_icon,
     const gfx::ImageSkia& hover_icon)
     : views::TextButton(listener, text) {
-  set_border(new HorizontalPaddingButtonBorder);
+  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());
   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 666 matching lines @@
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   add_account_button_ = new views::BlueButton(
       this,
       l10n_util::GetStringFUTF16(IDS_PROFILES_PROFILE_ADD_ACCOUNT_BUTTON,
                                  avatar_item.name));
   layout->StartRow(1, 0);
   layout->AddView(add_account_button_);
   return view;
 }