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

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

Issue 332243002: Network connectivity errors handling (incl. CP) for enrollment flow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Implemented observer for webuiloginview Created 6 years, 6 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 "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler = 237 AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler =
238 new AutoEnrollmentCheckScreenHandler(); 238 new AutoEnrollmentCheckScreenHandler();
239 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler; 239 auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler;
240 AddScreenHandler(auto_enrollment_check_screen_handler); 240 AddScreenHandler(auto_enrollment_check_screen_handler);
241 241
242 HIDDetectionScreenHandler* hid_detection_screen_handler = 242 HIDDetectionScreenHandler* hid_detection_screen_handler =
243 new HIDDetectionScreenHandler(); 243 new HIDDetectionScreenHandler();
244 hid_detection_screen_actor_ = hid_detection_screen_handler; 244 hid_detection_screen_actor_ = hid_detection_screen_handler;
245 AddScreenHandler(hid_detection_screen_handler); 245 AddScreenHandler(hid_detection_screen_handler);
246 246
247 error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
248 AddScreenHandler(error_screen_handler_);
249
247 EnrollmentScreenHandler* enrollment_screen_handler = 250 EnrollmentScreenHandler* enrollment_screen_handler =
248 new EnrollmentScreenHandler(); 251 new EnrollmentScreenHandler(network_state_informer_,
252 error_screen_handler_);
249 enrollment_screen_actor_ = enrollment_screen_handler; 253 enrollment_screen_actor_ = enrollment_screen_handler;
250 AddScreenHandler(enrollment_screen_handler); 254 AddScreenHandler(enrollment_screen_handler);
251 255
252 TermsOfServiceScreenHandler* terms_of_service_screen_handler = 256 TermsOfServiceScreenHandler* terms_of_service_screen_handler =
253 new TermsOfServiceScreenHandler; 257 new TermsOfServiceScreenHandler;
254 terms_of_service_screen_actor_ = terms_of_service_screen_handler; 258 terms_of_service_screen_actor_ = terms_of_service_screen_handler;
255 AddScreenHandler(terms_of_service_screen_handler); 259 AddScreenHandler(terms_of_service_screen_handler);
256 260
257 UserImageScreenHandler* user_image_screen_handler = 261 UserImageScreenHandler* user_image_screen_handler =
258 new UserImageScreenHandler(); 262 new UserImageScreenHandler();
259 user_image_screen_actor_ = user_image_screen_handler; 263 user_image_screen_actor_ = user_image_screen_handler;
260 AddScreenHandler(user_image_screen_handler); 264 AddScreenHandler(user_image_screen_handler);
261 265
262 error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
263 AddScreenHandler(error_screen_handler_);
264
265 gaia_screen_handler_ = new GaiaScreenHandler(network_state_informer_); 266 gaia_screen_handler_ = new GaiaScreenHandler(network_state_informer_);
266 AddScreenHandler(gaia_screen_handler_); 267 AddScreenHandler(gaia_screen_handler_);
267 268
268 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_, 269 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_,
269 error_screen_handler_, 270 error_screen_handler_,
270 core_handler_, 271 core_handler_,
271 gaia_screen_handler_); 272 gaia_screen_handler_);
272 AddScreenHandler(signin_screen_handler_); 273 AddScreenHandler(signin_screen_handler_);
273 274
274 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler = 275 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler =
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 observer_list_, 525 observer_list_,
525 OnCurrentScreenChanged(current_screen_, new_screen)); 526 OnCurrentScreenChanged(current_screen_, new_screen));
526 current_screen_ = new_screen; 527 current_screen_ = new_screen;
527 } else { 528 } else {
528 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; 529 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
529 current_screen_ = SCREEN_UNKNOWN; 530 current_screen_ = SCREEN_UNKNOWN;
530 } 531 }
531 } 532 }
532 533
533 } // namespace chromeos 534 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698