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

Side by Side Diff: ash/touch/touch_hud_projection.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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/touch/touch_hud_debug.cc ('k') | ash/utility/partial_screenshot_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « ash/touch/touch_hud_debug.cc ('k') | ash/utility/partial_screenshot_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698