Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Side by Side Diff: chrome/browser/ui/views/toolbar/app_menu_animation.h

Issue 2843413003: [Views] App Menu Icon Update (Closed)
Patch Set: Fix for isherman Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_ANIMATION_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_ANIMATION_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_ANIMATION_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_ANIMATION_H_
7 7
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 #include "ui/gfx/animation/animation_delegate.h" 10 #include "ui/gfx/animation/animation_delegate.h"
11 #include "ui/gfx/animation/slide_animation.h" 11 #include "ui/gfx/animation/slide_animation.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 class Canvas; 14 class Canvas;
15 class PointF; 15 class PointF;
16 } // namespace gfx 16 } // namespace gfx
17 17
18 class AppMenuButton; 18 class AppMenuButton;
19 19
20 // This class is used for animating and drawing the app menu icon. 20 // This class is used for animating and drawing the app menu icon.
21 class AppMenuAnimation : public gfx::AnimationDelegate { 21 class AppMenuAnimation : public gfx::AnimationDelegate {
22 public: 22 public:
23 AppMenuAnimation(AppMenuButton* owner, bool should_animate_closed); 23 AppMenuAnimation(AppMenuButton* owner, SkColor initial_color);
24 24
25 ~AppMenuAnimation() override; 25 ~AppMenuAnimation() override;
26 26
27 // Paints the app menu icon. 27 // Paints the app menu icon.
28 void PaintAppMenu(gfx::Canvas* canvas, const gfx::Rect& bounds); 28 void PaintAppMenu(gfx::Canvas* canvas, const gfx::Rect& bounds);
29 29
30 // Updates the icon colors. 30 // Updates the icon colors.
msw 2017/04/28 21:39:12 nit: s/colors/color.
spqchan 2017/04/29 00:36:33 Removed the comment since it's a setter (and self
31 void SetIconColors(SkColor start_color, SkColor severity_color); 31 void set_severity_color(SkColor severity_color) {
32 severity_color_ = severity_color;
33 }
32 34
33 // Starts the animation if it's not already running. 35 // Starts the animation if it's not already running.
34 void StartAnimation(); 36 void StartAnimation();
35 37
36 // gfx::AnimationDelegate: 38 // gfx::AnimationDelegate:
37 void AnimationEnded(const gfx::Animation* animation) override; 39 void AnimationEnded(const gfx::Animation* animation) override;
38 void AnimationProgressed(const gfx::Animation* animation) override; 40 void AnimationProgressed(const gfx::Animation* animation) override;
39 41
40 private: 42 private:
41 // This class is used to represent and paint a dot on the app menu. 43 // This class is used to represent and paint a dot on the app menu.
(...skipping 21 matching lines...) Expand all
63 // The percentage of the overall animation duration it takes to animate the 65 // The percentage of the overall animation duration it takes to animate the
64 // width and stroke to their open state. 66 // width and stroke to their open state.
65 const float width_open_interval_; 67 const float width_open_interval_;
66 const float stroke_open_interval_; 68 const float stroke_open_interval_;
67 69
68 DISALLOW_COPY_AND_ASSIGN(AppMenuDot); 70 DISALLOW_COPY_AND_ASSIGN(AppMenuDot);
69 }; 71 };
70 72
71 AppMenuButton* const owner_; 73 AppMenuButton* const owner_;
72 74
73 // True if the animation should close after it finishes opening.
74 const bool should_animate_closed_;
75
76 std::unique_ptr<gfx::SlideAnimation> animation_; 75 std::unique_ptr<gfx::SlideAnimation> animation_;
77 76
78 AppMenuDot bottom_dot_; 77 AppMenuDot bottom_dot_;
79 AppMenuDot middle_dot_; 78 AppMenuDot middle_dot_;
80 AppMenuDot top_dot_; 79 AppMenuDot top_dot_;
81 80
82 // The starting color of the dots. The animation is expected to transition 81 // The starting color of the dots. The animation is expected to transition
83 // from this color to |severity_color_|. 82 // from this color to |severity_color_|.
84 SkColor start_color_; 83 SkColor start_color_;
85 84
86 // The severity color of the dots. This is final color at the end of the 85 // The severity color of the dots. This is final color at the end of the
87 // animation. 86 // animation.
88 SkColor severity_color_; 87 SkColor severity_color_;
89 88
90 DISALLOW_COPY_AND_ASSIGN(AppMenuAnimation); 89 DISALLOW_COPY_AND_ASSIGN(AppMenuAnimation);
91 }; 90 };
92 91
93 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_ANIMATION_H_ 92 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_ANIMATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698