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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 5 years, 10 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/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler = 287 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler =
288 new AutoEnrollmentCheckScreenHandler(); 288 new AutoEnrollmentCheckScreenHandler();
289 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler; 289 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler;
290 AddScreenHandler(auto_enrollment_check_screen_handler); 290 AddScreenHandler(auto_enrollment_check_screen_handler);
291 291
292 HIDDetectionScreenHandler* hid_detection_screen_handler = 292 HIDDetectionScreenHandler* hid_detection_screen_handler =
293 new HIDDetectionScreenHandler(core_handler_); 293 new HIDDetectionScreenHandler(core_handler_);
294 hid_detection_screen_actor_ = hid_detection_screen_handler; 294 hid_detection_screen_actor_ = hid_detection_screen_handler;
295 AddScreenHandler(hid_detection_screen_handler); 295 AddScreenHandler(hid_detection_screen_handler);
296 296
297 error_screen_handler_ = new ErrorScreenHandler(network_state_informer_); 297 error_screen_handler_ = new ErrorScreenHandler();
298 AddScreenHandler(error_screen_handler_); 298 AddScreenHandler(error_screen_handler_);
299 299
300 // Initialize ErrorScreen if it hasn't initialized. 300 // Initialize ErrorScreen if it hasn't initialized so that NetworkErrorModel
301 // is binded properly.
302 NetworkErrorModel* network_error_model = nullptr;
301 if (WizardController::default_controller()) { 303 if (WizardController::default_controller()) {
302 BaseScreen* screen = WizardController::default_controller()->GetScreen( 304 network_error_model = static_cast<NetworkErrorModel*>(
303 WizardController::kErrorScreenName); 305 WizardController::default_controller()->GetScreen(
304 CHECK(screen); 306 WizardController::kErrorScreenName));
307 CHECK(network_error_model);
305 } else { 308 } else {
306 error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_)); 309 error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_));
310 network_error_model = error_screen_.get();
307 } 311 }
308 312
309 EnrollmentScreenHandler* enrollment_screen_handler = 313 EnrollmentScreenHandler* enrollment_screen_handler =
310 new EnrollmentScreenHandler(network_state_informer_, 314 new EnrollmentScreenHandler(network_state_informer_, network_error_model);
311 error_screen_handler_);
312 enrollment_screen_actor_ = enrollment_screen_handler; 315 enrollment_screen_actor_ = enrollment_screen_handler;
313 AddScreenHandler(enrollment_screen_handler); 316 AddScreenHandler(enrollment_screen_handler);
314 317
315 TermsOfServiceScreenHandler* terms_of_service_screen_handler = 318 TermsOfServiceScreenHandler* terms_of_service_screen_handler =
316 new TermsOfServiceScreenHandler(core_handler_); 319 new TermsOfServiceScreenHandler(core_handler_);
317 terms_of_service_screen_actor_ = terms_of_service_screen_handler; 320 terms_of_service_screen_actor_ = terms_of_service_screen_handler;
318 AddScreenHandler(terms_of_service_screen_handler); 321 AddScreenHandler(terms_of_service_screen_handler);
319 322
320 UserImageScreenHandler* user_image_screen_handler = 323 UserImageScreenHandler* user_image_screen_handler =
321 new UserImageScreenHandler(); 324 new UserImageScreenHandler();
322 user_image_view_ = user_image_screen_handler; 325 user_image_view_ = user_image_screen_handler;
323 AddScreenHandler(user_image_screen_handler); 326 AddScreenHandler(user_image_screen_handler);
324 327
325 policy::ConsumerManagementService* consumer_management = 328 policy::ConsumerManagementService* consumer_management =
326 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 329 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
327 GetConsumerManagementService(); 330 GetConsumerManagementService();
328 331
329 user_board_screen_handler_ = new UserBoardScreenHandler(); 332 user_board_screen_handler_ = new UserBoardScreenHandler();
330 AddScreenHandler(user_board_screen_handler_); 333 AddScreenHandler(user_board_screen_handler_);
331 334
332 gaia_screen_handler_ = 335 gaia_screen_handler_ =
333 new GaiaScreenHandler( 336 new GaiaScreenHandler(
334 core_handler_, network_state_informer_, consumer_management); 337 core_handler_, network_state_informer_, consumer_management);
335 AddScreenHandler(gaia_screen_handler_); 338 AddScreenHandler(gaia_screen_handler_);
336 339
337 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_, 340 signin_screen_handler_ =
338 error_screen_handler_, 341 new SigninScreenHandler(network_state_informer_, network_error_model,
339 core_handler_, 342 core_handler_, gaia_screen_handler_);
340 gaia_screen_handler_);
341 AddScreenHandler(signin_screen_handler_); 343 AddScreenHandler(signin_screen_handler_);
342 344
343 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler = 345 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler =
344 new AppLaunchSplashScreenHandler(network_state_informer_, 346 new AppLaunchSplashScreenHandler(network_state_informer_,
345 error_screen_handler_); 347 network_error_model);
346 AddScreenHandler(app_launch_splash_screen_handler); 348 AddScreenHandler(app_launch_splash_screen_handler);
347 app_launch_splash_screen_actor_ = app_launch_splash_screen_handler; 349 app_launch_splash_screen_actor_ = app_launch_splash_screen_handler;
348 350
349 if (display_type_ == kOobeDisplay) { 351 if (display_type_ == kOobeDisplay) {
350 ControllerPairingScreenHandler* handler = 352 ControllerPairingScreenHandler* handler =
351 new ControllerPairingScreenHandler(); 353 new ControllerPairingScreenHandler();
352 controller_pairing_screen_actor_ = handler; 354 controller_pairing_screen_actor_ = handler;
353 AddScreenHandler(handler); 355 AddScreenHandler(handler);
354 } 356 }
355 357
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 } 464 }
463 465
464 DeviceDisabledScreenActor* OobeUI::GetDeviceDisabledScreenActor() { 466 DeviceDisabledScreenActor* OobeUI::GetDeviceDisabledScreenActor() {
465 return device_disabled_screen_actor_; 467 return device_disabled_screen_actor_;
466 } 468 }
467 469
468 UserImageView* OobeUI::GetUserImageView() { 470 UserImageView* OobeUI::GetUserImageView() {
469 return user_image_view_; 471 return user_image_view_;
470 } 472 }
471 473
472 ErrorScreenActor* OobeUI::GetErrorScreenActor() { 474 NetworkErrorView* OobeUI::GetNetworkErrorView() {
473 return error_screen_handler_; 475 return error_screen_handler_;
474 } 476 }
475 477
476 SupervisedUserCreationScreenHandler* 478 SupervisedUserCreationScreenHandler*
477 OobeUI::GetSupervisedUserCreationScreenActor() { 479 OobeUI::GetSupervisedUserCreationScreenActor() {
478 return supervised_user_creation_screen_actor_; 480 return supervised_user_creation_screen_actor_;
479 } 481 }
480 482
481 GaiaScreenHandler* OobeUI::GetGaiaScreenActor() { 483 GaiaScreenHandler* OobeUI::GetGaiaScreenActor() {
482 return gaia_screen_handler_; 484 return gaia_screen_handler_;
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 DCHECK(screen_ids_.count(screen)) 655 DCHECK(screen_ids_.count(screen))
654 << "Screen should be registered in InitializeScreenMaps()"; 656 << "Screen should be registered in InitializeScreenMaps()";
655 Screen new_screen = screen_ids_[screen]; 657 Screen new_screen = screen_ids_[screen];
656 FOR_EACH_OBSERVER(Observer, 658 FOR_EACH_OBSERVER(Observer,
657 observer_list_, 659 observer_list_,
658 OnCurrentScreenChanged(current_screen_, new_screen)); 660 OnCurrentScreenChanged(current_screen_, new_screen));
659 current_screen_ = new_screen; 661 current_screen_ = new_screen;
660 } 662 }
661 663
662 } // namespace chromeos 664 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698