Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Unified Diff: ui/views/touchui/touch_editing_menu.cc

Issue 81833007: Remove unnecessary Border subclasses where we can achieve the same functionality (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/touchui/touch_editing_menu.cc
===================================================================
--- ui/views/touchui/touch_editing_menu.cc (revision 236651)
+++ ui/views/touchui/touch_editing_menu.cc (working copy)
@@ -36,28 +36,6 @@
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,
@@ -154,10 +132,13 @@
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;
« chrome/browser/ui/views/infobars/infobar_view.cc ('K') | « ui/views/controls/button/text_button.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698