OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "ash/touch/touch_hud_projection.h" | 5 #include "ash/touch/touch_hud_projection.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "skia/ext/refptr.h" | 9 #include "skia/ext/refptr.h" |
10 #include "third_party/skia/include/effects/SkGradientShader.h" | 10 #include "third_party/skia/include/effects/SkGradientShader.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 } | 119 } |
120 | 120 |
121 const gfx::Point circle_center_; | 121 const gfx::Point circle_center_; |
122 const SkPoint gradient_center_; | 122 const SkPoint gradient_center_; |
123 | 123 |
124 SkPaint fill_paint_; | 124 SkPaint fill_paint_; |
125 SkPaint stroke_paint_; | 125 SkPaint stroke_paint_; |
126 SkColor gradient_colors_[2]; | 126 SkColor gradient_colors_[2]; |
127 SkScalar gradient_pos_[2]; | 127 SkScalar gradient_pos_[2]; |
128 | 128 |
129 scoped_ptr<gfx::Animation> fadeout_; | 129 std::unique_ptr<gfx::Animation> fadeout_; |
130 | 130 |
131 DISALLOW_COPY_AND_ASSIGN(TouchPointView); | 131 DISALLOW_COPY_AND_ASSIGN(TouchPointView); |
132 }; | 132 }; |
133 | 133 |
134 TouchHudProjection::TouchHudProjection(aura::Window* initial_root) | 134 TouchHudProjection::TouchHudProjection(aura::Window* initial_root) |
135 : TouchObserverHUD(initial_root) { | 135 : TouchObserverHUD(initial_root) { |
136 } | 136 } |
137 | 137 |
138 TouchHudProjection::~TouchHudProjection() { | 138 TouchHudProjection::~TouchHudProjection() { |
139 } | 139 } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 RootWindowController* controller) { | 173 RootWindowController* controller) { |
174 controller->set_touch_hud_projection(this); | 174 controller->set_touch_hud_projection(this); |
175 } | 175 } |
176 | 176 |
177 void TouchHudProjection::UnsetHudForRootWindowController( | 177 void TouchHudProjection::UnsetHudForRootWindowController( |
178 RootWindowController* controller) { | 178 RootWindowController* controller) { |
179 controller->set_touch_hud_projection(NULL); | 179 controller->set_touch_hud_projection(NULL); |
180 } | 180 } |
181 | 181 |
182 } // namespace ash | 182 } // namespace ash |
OLD | NEW |