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

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

Issue 2033553003: Add MD ink drop ripple to shelf app items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed TODO Created 4 years, 6 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 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 friend class test::InkDropHostViewTestApi; 72 friend class test::InkDropHostViewTestApi;
73 73
74 std::unique_ptr<InkDrop> ink_drop_; 74 std::unique_ptr<InkDrop> ink_drop_;
75 75
76 // Intentionally declared after |ink_drop_| so that it doesn't access a 76 // Intentionally declared after |ink_drop_| so that it doesn't access a
77 // destroyed |ink_drop_| during destruction. 77 // destroyed |ink_drop_| during destruction.
78 std::unique_ptr<InkDropGestureHandler> gesture_handler_; 78 std::unique_ptr<InkDropGestureHandler> gesture_handler_;
79 79
80 gfx::Size ink_drop_size_; 80 gfx::Size ink_drop_size_;
81 81
82 // Determines whether the view was already painting to layer before adding ink
83 // drop layer.
84 bool old_paint_to_layer_;
85
82 bool destroying_; 86 bool destroying_;
83 87
84 DISALLOW_COPY_AND_ASSIGN(InkDropHostView); 88 DISALLOW_COPY_AND_ASSIGN(InkDropHostView);
85 }; 89 };
86 } // namespace views 90 } // namespace views
87 91
88 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_ 92 #endif // UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_button.h ('k') | ui/views/animation/ink_drop_host_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698