Refactoring to make adding ink drop animations easier

chrome/browser/ui/views/toolbar/toolbar_button.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/animation/ink_drop_host.h"
@@ skipping 55 matching lines @@
   // views::LabelButton:
   bool ShouldEnterPushedState(const ui::Event& event) override;
   void NotifyClick(const ui::Event& event) override;
 
   // Returns if menu should be shown. Override this to change default behavior.
   virtual bool ShouldShowMenu();
 
   // Function to show the dropdown menu.
   virtual void ShowDropDownMenu(ui::MenuSourceType source_type);
 
-  // Returns the Point where the ink drop should be centered.
-  virtual gfx::Point CalculateInkDropCenter() const;
-
   views::InkDropAnimationController* ink_drop_animation_controller() {
     return ink_drop_animation_controller_.get();
   }
 
  private:
   // views::LabelButton:
   const char* GetClassName() const override;
 
+  // views::InkDropHost:
+  gfx::Point CalculateInkDropCenter() const override;
+
   // The model that populates the attached menu.
   scoped_ptr<ui::MenuModel> model_;
 
   // Indicates if menu is currently showing.
   bool menu_showing_;
 
   // Y position of mouse when left mouse button is pressed
   int y_position_on_lbuttondown_;
 
   // Menu runner to display drop down menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   // Animation controller for the ink drop ripple effect.
   scoped_ptr<views::InkDropAnimationController> ink_drop_animation_controller_;
 
   // A factory for tasks that show the dropdown context menu for the button.
   base::WeakPtrFactory<ToolbarButton> show_menu_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_