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

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

Issue 2499453002: Add ink drop ripple to overview mode button (Closed)
Patch Set: Rebased Created 4 years, 1 month 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_HOST_VIEW_H_ 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
6 #define UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_ 6 #define UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "third_party/skia/include/core/SkColor.h" 10 #include "third_party/skia/include/core/SkColor.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 InkDrop* GetInkDrop(); 102 InkDrop* GetInkDrop();
103 103
104 // Returns an InkDropImpl configured to work well with a 104 // Returns an InkDropImpl configured to work well with a
105 // flood-fill ink drop ripple. 105 // flood-fill ink drop ripple.
106 std::unique_ptr<InkDropImpl> CreateDefaultFloodFillInkDropImpl(); 106 std::unique_ptr<InkDropImpl> CreateDefaultFloodFillInkDropImpl();
107 107
108 // Returns an InkDropImpl with default configuration. The base implementation 108 // Returns an InkDropImpl with default configuration. The base implementation
109 // of CreateInkDrop() delegates to this function. 109 // of CreateInkDrop() delegates to this function.
110 std::unique_ptr<InkDropImpl> CreateDefaultInkDropImpl(); 110 std::unique_ptr<InkDropImpl> CreateDefaultInkDropImpl();
111 111
112 InkDropMode ink_drop_mode() const { return ink_drop_mode_; }
113
112 private: 114 private:
113 class InkDropGestureHandler; 115 class InkDropGestureHandler;
114 friend class InkDropGestureHandler; 116 friend class InkDropGestureHandler;
115 friend class test::InkDropHostViewTestApi; 117 friend class test::InkDropHostViewTestApi;
116 118
117 // The last user Event to trigger an ink drop ripple animation. 119 // The last user Event to trigger an ink drop ripple animation.
118 std::unique_ptr<ui::LocatedEvent> last_ripple_triggering_event_; 120 std::unique_ptr<ui::LocatedEvent> last_ripple_triggering_event_;
119 121
120 // Defines what type of |ink_drop_| to create. 122 // Defines what type of |ink_drop_| to create.
121 InkDropMode ink_drop_mode_; 123 InkDropMode ink_drop_mode_;
(...skipping 11 matching lines...) Expand all
133 // drop layer. 135 // drop layer.
134 bool old_paint_to_layer_; 136 bool old_paint_to_layer_;
135 137
136 bool destroying_; 138 bool destroying_;
137 139
138 DISALLOW_COPY_AND_ASSIGN(InkDropHostView); 140 DISALLOW_COPY_AND_ASSIGN(InkDropHostView);
139 }; 141 };
140 } // namespace views 142 } // namespace views
141 143
142 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_ 144 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc ('k') | ui/views/animation/ink_drop_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698