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

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

Issue 2723843002: Remove non-MD code from TrayBackgroundView (Closed)
Patch Set: Rebased Created 3 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
« no previous file with comments | « ash/resources/default_200_percent/common/shelf/status_tray_vertical_pressed_top.png ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 InkDrop* GetInkDrop(); 115 InkDrop* GetInkDrop();
116 116
117 // Returns an InkDropImpl configured to work well with a 117 // Returns an InkDropImpl configured to work well with a
118 // flood-fill ink drop ripple. 118 // flood-fill ink drop ripple.
119 std::unique_ptr<InkDropImpl> CreateDefaultFloodFillInkDropImpl(); 119 std::unique_ptr<InkDropImpl> CreateDefaultFloodFillInkDropImpl();
120 120
121 // Returns an InkDropImpl with default configuration. The base implementation 121 // Returns an InkDropImpl with default configuration. The base implementation
122 // of CreateInkDrop() delegates to this function. 122 // of CreateInkDrop() delegates to this function.
123 std::unique_ptr<InkDropImpl> CreateDefaultInkDropImpl(); 123 std::unique_ptr<InkDropImpl> CreateDefaultInkDropImpl();
124 124
125 InkDropMode ink_drop_mode() const { return ink_drop_mode_; }
126
127 private: 125 private:
128 class InkDropGestureHandler; 126 class InkDropGestureHandler;
129 friend class InkDropGestureHandler; 127 friend class InkDropGestureHandler;
130 friend class test::InkDropHostViewTestApi; 128 friend class test::InkDropHostViewTestApi;
131 129
132 // The last user Event to trigger an ink drop ripple animation. 130 // The last user Event to trigger an ink drop ripple animation.
133 std::unique_ptr<ui::LocatedEvent> last_ripple_triggering_event_; 131 std::unique_ptr<ui::LocatedEvent> last_ripple_triggering_event_;
134 132
135 // Defines what type of |ink_drop_| to create. 133 // Defines what type of |ink_drop_| to create.
136 InkDropMode ink_drop_mode_; 134 InkDropMode ink_drop_mode_;
(...skipping 13 matching lines...) Expand all
150 148
151 bool destroying_; 149 bool destroying_;
152 150
153 std::unique_ptr<views::InkDropMask> ink_drop_mask_; 151 std::unique_ptr<views::InkDropMask> ink_drop_mask_;
154 152
155 DISALLOW_COPY_AND_ASSIGN(InkDropHostView); 153 DISALLOW_COPY_AND_ASSIGN(InkDropHostView);
156 }; 154 };
157 } // namespace views 155 } // namespace views
158 156
159 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_ 157 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
OLDNEW
« no previous file with comments | « ash/resources/default_200_percent/common/shelf/status_tray_vertical_pressed_top.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698