Refactoring to make adding ink drop animations easier

ui/views/controls/button/menu_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 46 matching lines @@
     menu_marker_ = menu_marker;
   }
   const gfx::ImageSkia* menu_marker() const { return menu_marker_; }
 
   const gfx::Point& menu_offset() const { return menu_offset_; }
   void set_menu_offset(int x, int y) { menu_offset_.SetPoint(x, y); }
 
   // Activate the button (called when the button is pressed).
   bool Activate();
 
-  // Called to signal that the action will not be activated.
-  void WillNotActivate();
-
   // Overridden from View:
   gfx::Size GetPreferredSize() const override;
   const char* GetClassName() const override;
   void OnPaint(gfx::Canvas* canvas) override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void OnMouseMoved(const ui::MouseEvent& event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
@@ skipping 37 matching lines @@
 
   // Our listener. Not owned.
   MenuButtonListener* listener_;
 
   // Whether or not we're showing a drop marker.
   bool show_menu_marker_;
 
   // The down arrow used to differentiate the menu button from normal buttons.
   const gfx::ImageSkia* menu_marker_;
 
-  // If non-null the destuctor sets this to true. This is set while the menu is
+  // If non-null the destructor sets this to true. This is set while the menu is
   // showing and used to detect if the menu was deleted while running.
   bool* destroyed_flag_;
 
   // The current number of "pressed" locks this button has.
   int pressed_lock_count_;
 
   // True if the button was in a disabled state when a menu was run, and should
   // return to it once the press is complete. This can happen if, e.g., we
   // programmatically show a menu on a disabled button.
   bool should_disable_after_press_;
 
   base::WeakPtrFactory<MenuButton> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_