OLD | NEW |
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/values.h" | 9 #include "base/values.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 | 257 |
258 UserImageScreenHandler* user_image_screen_handler = | 258 UserImageScreenHandler* user_image_screen_handler = |
259 new UserImageScreenHandler(); | 259 new UserImageScreenHandler(); |
260 user_image_screen_actor_ = user_image_screen_handler; | 260 user_image_screen_actor_ = user_image_screen_handler; |
261 AddScreenHandler(user_image_screen_handler); | 261 AddScreenHandler(user_image_screen_handler); |
262 | 262 |
263 policy::ConsumerManagementService* consumer_management = | 263 policy::ConsumerManagementService* consumer_management = |
264 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> | 264 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> |
265 GetConsumerManagementService(); | 265 GetConsumerManagementService(); |
266 gaia_screen_handler_ = | 266 gaia_screen_handler_ = |
267 new GaiaScreenHandler(network_state_informer_, consumer_management); | 267 new GaiaScreenHandler( |
| 268 core_handler_, network_state_informer_, consumer_management); |
268 AddScreenHandler(gaia_screen_handler_); | 269 AddScreenHandler(gaia_screen_handler_); |
269 | 270 |
270 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_, | 271 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_, |
271 error_screen_handler_, | 272 error_screen_handler_, |
272 core_handler_, | 273 core_handler_, |
273 gaia_screen_handler_); | 274 gaia_screen_handler_); |
274 AddScreenHandler(signin_screen_handler_); | 275 AddScreenHandler(signin_screen_handler_); |
275 | 276 |
276 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler = | 277 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler = |
277 new AppLaunchSplashScreenHandler(network_state_informer_, | 278 new AppLaunchSplashScreenHandler(network_state_informer_, |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 DCHECK(screen_ids_.count(screen)) | 539 DCHECK(screen_ids_.count(screen)) |
539 << "Screen should be registered in InitializeScreenMaps()"; | 540 << "Screen should be registered in InitializeScreenMaps()"; |
540 Screen new_screen = screen_ids_[screen]; | 541 Screen new_screen = screen_ids_[screen]; |
541 FOR_EACH_OBSERVER(Observer, | 542 FOR_EACH_OBSERVER(Observer, |
542 observer_list_, | 543 observer_list_, |
543 OnCurrentScreenChanged(current_screen_, new_screen)); | 544 OnCurrentScreenChanged(current_screen_, new_screen)); |
544 current_screen_ = new_screen; | 545 current_screen_ = new_screen; |
545 } | 546 } |
546 | 547 |
547 } // namespace chromeos | 548 } // namespace chromeos |
OLD | NEW |