| Index: chrome/browser/ui/views/toolbar/app_menu_button.h
|
| diff --git a/chrome/browser/ui/views/toolbar/app_menu_button.h b/chrome/browser/ui/views/toolbar/app_menu_button.h
|
| index 96290b40b659500fc84272b286ff4ab28b5704b1..5e21d39cae73f730c0b55cdb4525118b08506d25 100644
|
| --- a/chrome/browser/ui/views/toolbar/app_menu_button.h
|
| +++ b/chrome/browser/ui/views/toolbar/app_menu_button.h
|
| @@ -9,6 +9,8 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "base/time/time.h"
|
| +#include "base/timer/timer.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
| #include "chrome/browser/ui/toolbar/app_menu_icon_controller.h"
|
| #include "ui/views/controls/button/menu_button.h"
|
| @@ -25,6 +27,7 @@ class MenuListener;
|
|
|
| class AppMenuAnimation;
|
| class ToolbarView;
|
| +class VectorIconAnimator;
|
|
|
| class AppMenuButton : public views::MenuButton, public TabStripModelObserver {
|
| public:
|
| @@ -117,7 +120,7 @@ class AppMenuButton : public views::MenuButton, public TabStripModelObserver {
|
| std::unique_ptr<AppMenu> menu_;
|
|
|
| // Used for animating and drawing the app menu icon.
|
| - std::unique_ptr<AppMenuAnimation> animation_;
|
| + std::unique_ptr<VectorIconAnimator> animator_;
|
|
|
| // True if the app menu should use the new animated icon.
|
| bool should_use_new_icon_;
|
| @@ -126,6 +129,9 @@ class AppMenuButton : public views::MenuButton, public TabStripModelObserver {
|
| // a maximized state to extend to the full window width.
|
| int margin_trailing_;
|
|
|
| + base::TimeTicks animation_start_time_;
|
| + base::RepeatingTimer animation_timer_;
|
| +
|
| // Used to spawn weak pointers for delayed tasks to open the overflow menu.
|
| base::WeakPtrFactory<AppMenuButton> weak_factory_;
|
|
|
|
|