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

Side by Side Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 #include <vector> 12 #include <vector>
12 13
13 #include "ash/shell_delegate.h" 14 #include "ash/shell_delegate.h"
14 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "chrome/browser/chromeos/login/app_launch_controller.h" 18 #include "chrome/browser/chromeos/login/app_launch_controller.h"
19 #include "chrome/browser/chromeos/login/auth/auth_prewarmer.h" 19 #include "chrome/browser/chromeos/login/auth/auth_prewarmer.h"
20 #include "chrome/browser/chromeos/login/existing_user_controller.h" 20 #include "chrome/browser/chromeos/login/existing_user_controller.h"
21 #include "chrome/browser/chromeos/login/signin_screen_controller.h" 21 #include "chrome/browser/chromeos/login/signin_screen_controller.h"
22 #include "chrome/browser/chromeos/login/ui/login_display.h" 22 #include "chrome/browser/chromeos/login/ui/login_display.h"
23 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 23 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
24 #include "chrome/browser/chromeos/login/wizard_controller.h" 24 #include "chrome/browser/chromeos/login/wizard_controller.h"
25 #include "chrome/browser/chromeos/settings/device_settings_service.h" 25 #include "chrome/browser/chromeos/settings/device_settings_service.h"
26 #include "chromeos/audio/cras_audio_handler.h" 26 #include "chromeos/audio/cras_audio_handler.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 194
195 // Called when login-prompt-visible signal is caught. 195 // Called when login-prompt-visible signal is caught.
196 void OnLoginPromptVisible(); 196 void OnLoginPromptVisible();
197 197
198 // Used to calculate position of the screens and background. 198 // Used to calculate position of the screens and background.
199 gfx::Rect background_bounds_; 199 gfx::Rect background_bounds_;
200 200
201 content::NotificationRegistrar registrar_; 201 content::NotificationRegistrar registrar_;
202 202
203 // The controller driving the auto-enrollment check. 203 // The controller driving the auto-enrollment check.
204 scoped_ptr<AutoEnrollmentController> auto_enrollment_controller_; 204 std::unique_ptr<AutoEnrollmentController> auto_enrollment_controller_;
205 205
206 // Sign in screen controller. 206 // Sign in screen controller.
207 scoped_ptr<ExistingUserController> existing_user_controller_; 207 std::unique_ptr<ExistingUserController> existing_user_controller_;
208 208
209 // OOBE and some screens (camera, recovery) controller. 209 // OOBE and some screens (camera, recovery) controller.
210 scoped_ptr<WizardController> wizard_controller_; 210 std::unique_ptr<WizardController> wizard_controller_;
211 211
212 scoped_ptr<SignInScreenController> signin_screen_controller_; 212 std::unique_ptr<SignInScreenController> signin_screen_controller_;
213 213
214 // App launch controller. 214 // App launch controller.
215 scoped_ptr<AppLaunchController> app_launch_controller_; 215 std::unique_ptr<AppLaunchController> app_launch_controller_;
216 216
217 // Demo app launcher. 217 // Demo app launcher.
218 scoped_ptr<DemoAppLauncher> demo_app_launcher_; 218 std::unique_ptr<DemoAppLauncher> demo_app_launcher_;
219 219
220 // Make sure chrome won't exit while we are at login/oobe screen. 220 // Make sure chrome won't exit while we are at login/oobe screen.
221 scoped_ptr<ScopedKeepAlive> keep_alive_; 221 std::unique_ptr<ScopedKeepAlive> keep_alive_;
222 222
223 // Has ShutdownDisplayHost() already been called? Used to avoid posting our 223 // Has ShutdownDisplayHost() already been called? Used to avoid posting our
224 // own deletion to the message loop twice if the user logs out while we're 224 // own deletion to the message loop twice if the user logs out while we're
225 // still in the process of cleaning up after login (http://crbug.com/134463). 225 // still in the process of cleaning up after login (http://crbug.com/134463).
226 bool shutting_down_; 226 bool shutting_down_;
227 227
228 // Whether progress bar is shown on the OOBE page. 228 // Whether progress bar is shown on the OOBE page.
229 bool oobe_progress_bar_visible_; 229 bool oobe_progress_bar_visible_;
230 230
231 // True if session start is in progress. 231 // True if session start is in progress.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 // Way to restore if renderer have crashed. 271 // Way to restore if renderer have crashed.
272 RestorePath restore_path_; 272 RestorePath restore_path_;
273 273
274 // Stored parameters for StartWizard, required to restore in case of crash. 274 // Stored parameters for StartWizard, required to restore in case of crash.
275 std::string first_screen_name_; 275 std::string first_screen_name_;
276 276
277 // Called before host deletion. 277 // Called before host deletion.
278 base::Closure completion_callback_; 278 base::Closure completion_callback_;
279 279
280 // Active instance of authentication prewarmer. 280 // Active instance of authentication prewarmer.
281 scoped_ptr<AuthPrewarmer> auth_prewarmer_; 281 std::unique_ptr<AuthPrewarmer> auth_prewarmer_;
282 282
283 // A focus ring controller to draw focus ring around view for keyboard 283 // A focus ring controller to draw focus ring around view for keyboard
284 // driven oobe. 284 // driven oobe.
285 scoped_ptr<FocusRingController> focus_ring_controller_; 285 std::unique_ptr<FocusRingController> focus_ring_controller_;
286 286
287 // Handles special keys for keyboard driven oobe. 287 // Handles special keys for keyboard driven oobe.
288 scoped_ptr<KeyboardDrivenOobeKeyHandler> keyboard_driven_oobe_key_handler_; 288 std::unique_ptr<KeyboardDrivenOobeKeyHandler>
289 keyboard_driven_oobe_key_handler_;
289 290
290 FinalizeAnimationType finalize_animation_type_; 291 FinalizeAnimationType finalize_animation_type_;
291 292
292 // Time when login prompt visible signal is received. Used for 293 // Time when login prompt visible signal is received. Used for
293 // calculations of delay before startup sound. 294 // calculations of delay before startup sound.
294 base::TimeTicks login_prompt_visible_time_; 295 base::TimeTicks login_prompt_visible_time_;
295 296
296 // True when request to play startup sound was sent to 297 // True when request to play startup sound was sent to
297 // SoundsManager. 298 // SoundsManager.
298 bool startup_sound_played_; 299 bool startup_sound_played_;
299 300
300 // When true, startup sound should be played only when spoken 301 // When true, startup sound should be played only when spoken
301 // feedback is enabled. Otherwise, startup sound should be played 302 // feedback is enabled. Otherwise, startup sound should be played
302 // in any case. 303 // in any case.
303 bool startup_sound_honors_spoken_feedback_; 304 bool startup_sound_honors_spoken_feedback_;
304 305
305 // True is subscribed as keyboard controller observer. 306 // True is subscribed as keyboard controller observer.
306 bool is_observing_keyboard_; 307 bool is_observing_keyboard_;
307 308
308 // Keeps a copy of the old Drag'n'Drop client, so that it would be disabled 309 // Keeps a copy of the old Drag'n'Drop client, so that it would be disabled
309 // during a login session and restored afterwards. 310 // during a login session and restored afterwards.
310 scoped_ptr<aura::client::ScopedDragDropDisabler> scoped_drag_drop_disabler_; 311 std::unique_ptr<aura::client::ScopedDragDropDisabler>
312 scoped_drag_drop_disabler_;
311 313
312 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_; 314 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_;
313 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_; 315 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
314 316
315 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl); 317 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
316 }; 318 };
317 319
318 } // namespace chromeos 320 } // namespace chromeos
319 321
320 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 322 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698