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

Side by Side Diff: ui/views/animation/ink_drop_animation_controller_impl.h

Issue 1724963002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky review Created 4 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_
6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ 6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/gfx/geometry/rect.h" 10 #include "ui/gfx/geometry/rect.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 // from the InkDropHost. 91 // from the InkDropHost.
92 scoped_ptr<ui::Layer> root_layer_; 92 scoped_ptr<ui::Layer> root_layer_;
93 93
94 // The current InkDropHover. Lazily created using CreateInkDropHover(); 94 // The current InkDropHover. Lazily created using CreateInkDropHover();
95 scoped_ptr<InkDropHover> hover_; 95 scoped_ptr<InkDropHover> hover_;
96 96
97 // The current InkDropAnimation. Created on demand using 97 // The current InkDropAnimation. Created on demand using
98 // CreateInkDropAnimation(). 98 // CreateInkDropAnimation().
99 scoped_ptr<InkDropAnimation> ink_drop_animation_; 99 scoped_ptr<InkDropAnimation> ink_drop_animation_;
100 100
101 // Tracks whether the InkDropAnimation can safely be destroyed when an
102 // InkDropState::HIDDEN animation completes.
103 bool can_destroy_after_hidden_animation_;
104
105 // The timer used to delay the hover fade in after an ink drop animation. 101 // The timer used to delay the hover fade in after an ink drop animation.
106 scoped_ptr<base::Timer> hover_after_animation_timer_; 102 scoped_ptr<base::Timer> hover_after_animation_timer_;
107 103
108 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImpl); 104 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImpl);
109 }; 105 };
110 106
111 } // namespace views 107 } // namespace views
112 108
113 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ 109 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_
OLDNEW
« no previous file with comments | « ui/views/animation/ink_drop_animation.cc ('k') | ui/views/animation/ink_drop_animation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698