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

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

Issue 1495753002: Make the material design ripple effect more visible on a quick action (single click or single tap) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Polished for review. Created 4 years, 10 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // from the InkDropHost. 108 // from the InkDropHost.
109 scoped_ptr<ui::Layer> root_layer_; 109 scoped_ptr<ui::Layer> root_layer_;
110 110
111 // The current InkDropHover. Lazily created using CreateInkDropHover(); 111 // The current InkDropHover. Lazily created using CreateInkDropHover();
112 scoped_ptr<InkDropHover> hover_; 112 scoped_ptr<InkDropHover> hover_;
113 113
114 // The current InkDropAnimation. Created on demand using 114 // The current InkDropAnimation. Created on demand using
115 // CreateInkDropAnimation(). 115 // CreateInkDropAnimation().
116 scoped_ptr<InkDropAnimation> ink_drop_animation_; 116 scoped_ptr<InkDropAnimation> ink_drop_animation_;
117 117
118 // Tracks whether the InkDropAnimation can safely be destroyed when an
119 // InkDropState::HIDDEN animation completes.
120 bool can_destroy_after_hidden_animation_;
121
118 // The timer used to delay the hover fade in after an ink drop animation. 122 // The timer used to delay the hover fade in after an ink drop animation.
119 scoped_ptr<base::Timer> hover_after_animation_timer_; 123 scoped_ptr<base::Timer> hover_after_animation_timer_;
120 124
121 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImpl); 125 DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImpl);
122 }; 126 };
123 127
124 } // namespace views 128 } // namespace views
125 129
126 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ 130 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698