Remove ScheduleAllView class from wrench_menu.cc

chrome/browser/ui/views/wrench_menu.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 "chrome/browser/ui/views/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 277 matching lines @@
   const ButtonType type_;
   const bool use_new_menu_;
 
   // See description above setter for details.
   CustomButton* left_button_;
   CustomButton* right_button_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuButtonBackground);
 };
 
-// A View subclass that forces SchedulePaint to paint all. Normally when the
-// mouse enters/exits a button the buttons invokes SchedulePaint. As part of the
-// button border (MenuButtonBackground) is rendered by the button to the
-// left/right of it SchedulePaint on the the button may not be enough, so this
-// forces a paint all.
-class ScheduleAllView : public views::View {
- public:
-  ScheduleAllView() {}
-
-  // Overridden from views::View.
-  virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE {
-    View::SchedulePaintInRect(gfx::Rect(0, 0, width(), height()));
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScheduleAllView);
-};
-
 string16 GetAccessibleNameForWrenchMenuItem(
       MenuModel* model, int item_index, int accessible_string_id) {
   string16 accessible_name = l10n_util::GetStringUTF16(accessible_string_id);
   string16 accelerator_text;
 
   ui::Accelerator menu_accelerator;
   if (model->GetAcceleratorAt(item_index, &menu_accelerator)) {
     accelerator_text =
         ui::Accelerator(menu_accelerator.key_code(),
                         menu_accelerator.modifiers()).GetShortcutText();
   }
 
   return MenuItemView::GetAccessibleNameForMenuItem(
       accessible_name, accelerator_text);
 }
 
 // WrenchMenuView is a view that can contain text buttons.
-class WrenchMenuView : public ScheduleAllView, public views::ButtonListener {
+class WrenchMenuView : public views::View,
+                       public views::ButtonListener {
  public:
   WrenchMenuView(WrenchMenu* menu, MenuModel* menu_model)
       : menu_(menu),
         menu_model_(menu_model) {}
 
+  // Overridden from views::View.
+  virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE {
+    // Normally when the mouse enters/exits a button the buttons invokes
+    // SchedulePaint. As part of the button border (MenuButtonBackground) is
+    // rendered by the button to the left/right of it SchedulePaint on the the
+    // button may not be enough, so this forces a paint all.
+    View::SchedulePaintInRect(gfx::Rect(0, 0, width(), height()));

[tfarina, 2013/01/04 19:15:34]

nit: gfx::Rect(size())

+  }
+
   TextButton* CreateAndConfigureButton(int string_id,
                                        MenuButtonBackground::ButtonType type,
                                        int index,
                                        MenuButtonBackground** background) {
     return CreateButtonWithAccName(
       string_id, type, index, background, string_id);
   }
 
   TextButton* CreateButtonWithAccName(int string_id,
                                       MenuButtonBackground::ButtonType type,
@@ skipping 804 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_,
                                browser_,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }