Refactored AppMenuAnimation

chrome/browser/ui/views/toolbar/app_menu_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_APP_MENU_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
+#include "chrome/browser/ui/toolbar/app_menu_animation.h"
 #include "chrome/browser/ui/toolbar/app_menu_icon_controller.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view.h"
 
 class AppMenu;
 class AppMenuModel;
 
 namespace views {
 class LabelButtonBorder;
 class MenuListener;
 }
 
-class AppMenuAnimation;
 class ToolbarView;
 
-class AppMenuButton : public views::MenuButton, public TabStripModelObserver {
+class AppMenuButton : public views::MenuButton,
+                      public TabStripModelObserver,
+                      public AppMenuAnimationDelegate {
  public:
   explicit AppMenuButton(ToolbarView* toolbar_view);
   ~AppMenuButton() override;
 
   void SetSeverity(AppMenuIconController::IconType type,
                    AppMenuIconController::Severity severity,
                    bool animate);
 
   // Shows the app menu. |for_drop| indicates whether the menu is opened for a
   // drag-and-drop operation.
@@ skipping 17 matching lines @@
   gfx::Size GetPreferredSize() const override;
   void Layout() override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // TabStripObserver:
   void TabInsertedAt(TabStripModel* tab_strip_model,
                      content::WebContents* contents,
                      int index,
                      bool foreground) override;
 
+  // AppMenuAnimationDelegate:
+  void AppMenuAnimationStarted() override;
+  void AppMenuAnimationEnded() override;
+  void InvalidateIcon() override;
+
   // Updates the presentation according to |severity_| and the theme provider.
   // If |should_animate| is true, the icon should animate.
   void UpdateIcon(bool should_animate);
 
   // Sets |margin_trailing_| when the browser is maximized and updates layout
   // to make the focus rectangle centered.
   void SetTrailingMargin(int margin);
 
   // Animates the icon if possible. The icon will not animate if the severity
   // level is none, |animation_| is nullptr or |should_use_new_icon_| is false.
   void AnimateIconIfPossible();
 
-  // Methods called by AppMenuAnimation when the animation has started/ended.
-  // The layer is managed inside these methods.
-  void AppMenuAnimationStarted();
-  void AppMenuAnimationEnded();
-
   // Opens the app menu immediately during a drag-and-drop operation.
   // Used only in testing.
   static bool g_open_app_immediately_for_testing;
 
  private:
   // views::MenuButton:
   const char* GetClassName() const override;
   std::unique_ptr<views::LabelButtonBorder> CreateDefaultBorder()
       const override;
   gfx::Rect GetThemePaintRect() const override;
@@ skipping 32 matching lines @@
   // a maximized state to extend to the full window width.
   int margin_trailing_;
 
   // Used to spawn weak pointers for delayed tasks to open the overflow menu.
   base::WeakPtrFactory<AppMenuButton> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppMenuButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_