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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

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: iwyu fixes 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 } 317 }
318 318
319 BaseScreen* WizardController::GetScreen(const std::string& screen_name) { 319 BaseScreen* WizardController::GetScreen(const std::string& screen_name) {
320 if (screen_name == kErrorScreenName) 320 if (screen_name == kErrorScreenName)
321 return GetErrorScreen(); 321 return GetErrorScreen();
322 return ScreenManager::GetScreen(screen_name); 322 return ScreenManager::GetScreen(screen_name);
323 } 323 }
324 324
325 BaseScreen* WizardController::CreateScreen(const std::string& screen_name) { 325 BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
326 if (screen_name == kNetworkScreenName) { 326 if (screen_name == kNetworkScreenName) {
327 scoped_ptr<NetworkScreen> screen( 327 std::unique_ptr<NetworkScreen> screen(
328 new NetworkScreen(this, this, oobe_ui_->GetNetworkView())); 328 new NetworkScreen(this, this, oobe_ui_->GetNetworkView()));
329 screen->Initialize(nullptr /* context */); 329 screen->Initialize(nullptr /* context */);
330 return screen.release(); 330 return screen.release();
331 } else if (screen_name == kUpdateScreenName) { 331 } else if (screen_name == kUpdateScreenName) {
332 scoped_ptr<UpdateScreen> screen(new UpdateScreen( 332 std::unique_ptr<UpdateScreen> screen(new UpdateScreen(
333 this, oobe_ui_->GetUpdateView(), remora_controller_.get())); 333 this, oobe_ui_->GetUpdateView(), remora_controller_.get()));
334 screen->Initialize(nullptr /* context */); 334 screen->Initialize(nullptr /* context */);
335 return screen.release(); 335 return screen.release();
336 } else if (screen_name == kUserImageScreenName) { 336 } else if (screen_name == kUserImageScreenName) {
337 return new UserImageScreen(this, oobe_ui_->GetUserImageView()); 337 return new UserImageScreen(this, oobe_ui_->GetUserImageView());
338 } else if (screen_name == kEulaScreenName) { 338 } else if (screen_name == kEulaScreenName) {
339 return new EulaScreen(this, this, oobe_ui_->GetEulaView()); 339 return new EulaScreen(this, this, oobe_ui_->GetEulaView());
340 } else if (screen_name == kEnrollmentScreenName) { 340 } else if (screen_name == kEnrollmentScreenName) {
341 return new EnrollmentScreen(this, oobe_ui_->GetEnrollmentScreenActor()); 341 return new EnrollmentScreen(this, oobe_ui_->GetEnrollmentScreenActor());
342 } else if (screen_name == kResetScreenName) { 342 } else if (screen_name == kResetScreenName) {
343 return new chromeos::ResetScreen(this, oobe_ui_->GetResetView()); 343 return new chromeos::ResetScreen(this, oobe_ui_->GetResetView());
344 } else if (screen_name == kEnableDebuggingScreenName) { 344 } else if (screen_name == kEnableDebuggingScreenName) {
345 return new EnableDebuggingScreen(this, 345 return new EnableDebuggingScreen(this,
346 oobe_ui_->GetEnableDebuggingScreenActor()); 346 oobe_ui_->GetEnableDebuggingScreenActor());
347 } else if (screen_name == kKioskEnableScreenName) { 347 } else if (screen_name == kKioskEnableScreenName) {
348 return new KioskEnableScreen(this, oobe_ui_->GetKioskEnableScreenActor()); 348 return new KioskEnableScreen(this, oobe_ui_->GetKioskEnableScreenActor());
349 } else if (screen_name == kKioskAutolaunchScreenName) { 349 } else if (screen_name == kKioskAutolaunchScreenName) {
350 return new KioskAutolaunchScreen(this, 350 return new KioskAutolaunchScreen(this,
351 oobe_ui_->GetKioskAutolaunchScreenActor()); 351 oobe_ui_->GetKioskAutolaunchScreenActor());
352 } else if (screen_name == kTermsOfServiceScreenName) { 352 } else if (screen_name == kTermsOfServiceScreenName) {
353 return new TermsOfServiceScreen(this, 353 return new TermsOfServiceScreen(this,
354 oobe_ui_->GetTermsOfServiceScreenActor()); 354 oobe_ui_->GetTermsOfServiceScreenActor());
355 } else if (screen_name == kWrongHWIDScreenName) { 355 } else if (screen_name == kWrongHWIDScreenName) {
356 return new WrongHWIDScreen(this, oobe_ui_->GetWrongHWIDScreenActor()); 356 return new WrongHWIDScreen(this, oobe_ui_->GetWrongHWIDScreenActor());
357 } else if (screen_name == kSupervisedUserCreationScreenName) { 357 } else if (screen_name == kSupervisedUserCreationScreenName) {
358 return new SupervisedUserCreationScreen( 358 return new SupervisedUserCreationScreen(
359 this, oobe_ui_->GetSupervisedUserCreationScreenActor()); 359 this, oobe_ui_->GetSupervisedUserCreationScreenActor());
360 } else if (screen_name == kHIDDetectionScreenName) { 360 } else if (screen_name == kHIDDetectionScreenName) {
361 scoped_ptr<HIDDetectionScreen> screen(new chromeos::HIDDetectionScreen( 361 std::unique_ptr<HIDDetectionScreen> screen(new chromeos::HIDDetectionScreen(
362 this, oobe_ui_->GetHIDDetectionView())); 362 this, oobe_ui_->GetHIDDetectionView()));
363 screen->Initialize(nullptr /* context */); 363 screen->Initialize(nullptr /* context */);
364 return screen.release(); 364 return screen.release();
365 } else if (screen_name == kAutoEnrollmentCheckScreenName) { 365 } else if (screen_name == kAutoEnrollmentCheckScreenName) {
366 return new AutoEnrollmentCheckScreen( 366 return new AutoEnrollmentCheckScreen(
367 this, oobe_ui_->GetAutoEnrollmentCheckScreenActor()); 367 this, oobe_ui_->GetAutoEnrollmentCheckScreenActor());
368 } else if (screen_name == kControllerPairingScreenName) { 368 } else if (screen_name == kControllerPairingScreenName) {
369 if (!shark_controller_) { 369 if (!shark_controller_) {
370 shark_controller_.reset( 370 shark_controller_.reset(
371 new pairing_chromeos::BluetoothControllerPairingController()); 371 new pairing_chromeos::BluetoothControllerPairingController());
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
1230 ShowErrorScreen(); 1230 ShowErrorScreen();
1231 } 1231 }
1232 1232
1233 PrefService* WizardController::GetLocalState() { 1233 PrefService* WizardController::GetLocalState() {
1234 if (local_state_for_testing_) 1234 if (local_state_for_testing_)
1235 return local_state_for_testing_; 1235 return local_state_for_testing_;
1236 return g_browser_process->local_state(); 1236 return g_browser_process->local_state();
1237 } 1237 }
1238 1238
1239 void WizardController::OnTimezoneResolved( 1239 void WizardController::OnTimezoneResolved(
1240 scoped_ptr<TimeZoneResponseData> timezone, 1240 std::unique_ptr<TimeZoneResponseData> timezone,
1241 bool server_error) { 1241 bool server_error) {
1242 DCHECK_CURRENTLY_ON(BrowserThread::UI); 1242 DCHECK_CURRENTLY_ON(BrowserThread::UI);
1243 DCHECK(timezone.get()); 1243 DCHECK(timezone.get());
1244 // To check that "this" is not destroyed try to access some member 1244 // To check that "this" is not destroyed try to access some member
1245 // (timezone_provider_) in this case. Expect crash here. 1245 // (timezone_provider_) in this case. Expect crash here.
1246 DCHECK(timezone_provider_.get()); 1246 DCHECK(timezone_provider_.get());
1247 1247
1248 timezone_resolved_ = true; 1248 timezone_resolved_ = true;
1249 base::ScopedClosureRunner inform_test(on_timezone_resolved_for_testing_); 1249 base::ScopedClosureRunner inform_test(on_timezone_resolved_for_testing_);
1250 on_timezone_resolved_for_testing_.Reset(); 1250 on_timezone_resolved_for_testing_.Reset();
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 1335
1336 if (!shark_connection_listener_) { 1336 if (!shark_connection_listener_) {
1337 shark_connection_listener_.reset( 1337 shark_connection_listener_.reset(
1338 new pairing_chromeos::SharkConnectionListener( 1338 new pairing_chromeos::SharkConnectionListener(
1339 base::Bind(&WizardController::OnSharkConnected, 1339 base::Bind(&WizardController::OnSharkConnected,
1340 weak_factory_.GetWeakPtr()))); 1340 weak_factory_.GetWeakPtr())));
1341 } 1341 }
1342 } 1342 }
1343 1343
1344 void WizardController::OnSharkConnected( 1344 void WizardController::OnSharkConnected(
1345 scoped_ptr<pairing_chromeos::HostPairingController> remora_controller) { 1345 std::unique_ptr<pairing_chromeos::HostPairingController>
1346 remora_controller) {
1346 VLOG(1) << "OnSharkConnected"; 1347 VLOG(1) << "OnSharkConnected";
1347 remora_controller_ = std::move(remora_controller); 1348 remora_controller_ = std::move(remora_controller);
1348 base::MessageLoop::current()->DeleteSoon( 1349 base::MessageLoop::current()->DeleteSoon(
1349 FROM_HERE, shark_connection_listener_.release()); 1350 FROM_HERE, shark_connection_listener_.release());
1350 SetControllerDetectedPref(true); 1351 SetControllerDetectedPref(true);
1351 ShowHostPairingScreen(); 1352 ShowHostPairingScreen();
1352 } 1353 }
1353 1354
1354 void WizardController::OnSetHostNetworkFailed() { 1355 void WizardController::OnSetHostNetworkFailed() {
1355 remora_controller_->OnNetworkConnectivityChanged( 1356 remora_controller_->OnNetworkConnectivityChanged(
(...skipping 14 matching lines...) Expand all
1370 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1371 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1371 } 1372 }
1372 1373
1373 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1374 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1374 screen->SetParameters(effective_config, shark_controller_.get()); 1375 screen->SetParameters(effective_config, shark_controller_.get());
1375 SetStatusAreaVisible(true); 1376 SetStatusAreaVisible(true);
1376 SetCurrentScreen(screen); 1377 SetCurrentScreen(screen);
1377 } 1378 }
1378 1379
1379 } // namespace chromeos 1380 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698