Remove unnecessary Border subclasses where we can achieve the same functionality

ui/views/touchui/touch_editing_menu.cc

 // Copyright (c) 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 "ui/views/touchui/touch_editing_menu.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 18 matching lines @@
 const int kMenuButtonHeight = 38;
 const int kMenuButtonWidth = 63;
 const int kMenuMargin = 1;
 
 const char* kEllipsesButtonText = "...";
 const int kEllipsesButtonTag = -1;
 }  // namespace
 
 namespace views {
 
-class TouchEditingMenuButtonBorder : public LabelButtonBorder {
- public:
-  TouchEditingMenuButtonBorder(Button::ButtonStyle style,
-                               const gfx::Insets& insets)
-      : LabelButtonBorder(style),
-        insets_(insets) {
-  }
-
-  virtual ~TouchEditingMenuButtonBorder() {
-  }
-
- private:
-  // Overridden from LabelButtonBorder
-  virtual gfx::Insets GetInsets() const OVERRIDE {
-    return insets_;
-  }
-
-  gfx::Insets insets_;
-
-  DISALLOW_COPY_AND_ASSIGN(TouchEditingMenuButtonBorder);
-};
-
 TouchEditingMenuView::TouchEditingMenuView(
     TouchEditingMenuController* controller,
     gfx::Rect anchor_rect,
     gfx::NativeView context)
     : BubbleDelegateView(NULL, views::BubbleBorder::BOTTOM_CENTER),
       controller_(controller) {
   set_anchor_rect(anchor_rect);
   set_shadow(views::BubbleBorder::SMALL_SHADOW);
   set_parent_window(context);
   set_margins(gfx::Insets(kMenuMargin, kMenuMargin, kMenuMargin, kMenuMargin));
@@ skipping 76 matching lines @@
   Layout();
 }
 
 Button* TouchEditingMenuView::CreateButton(const string16& title, int tag) {
   string16 label = gfx::RemoveAcceleratorChar(title, '&', NULL, NULL);
   LabelButton* button = new LabelButton(this, label);
   button->set_focusable(true);
   button->set_request_focus_on_press(false);
   gfx::Font font = ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::SmallFont);
+  scoped_ptr<LabelButtonBorder> button_border(
+      new LabelButtonBorder(button->style()));
   int v_border = (kMenuButtonHeight - font.GetHeight()) / 2;
   int h_border = (kMenuButtonWidth - font.GetStringWidth(label)) / 2;
-  button->set_border(new TouchEditingMenuButtonBorder(button->style(),
-      gfx::Insets(v_border, h_border, v_border, h_border)));
+  button_border->set_insets(
+      gfx::Insets(v_border, h_border, v_border, h_border));
+  button->set_border(button_border.release());
   button->SetFont(font);
   button->set_tag(tag);
   return button;
 }
 
 }  // namespace views