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 "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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 gaia_screen_handler_ = new GaiaScreenHandler(network_state_informer_); | 245 gaia_screen_handler_ = new GaiaScreenHandler(network_state_informer_); |
246 AddScreenHandler(gaia_screen_handler_); | 246 AddScreenHandler(gaia_screen_handler_); |
247 | 247 |
248 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_, | 248 signin_screen_handler_ = new SigninScreenHandler(network_state_informer_, |
249 error_screen_handler_, | 249 error_screen_handler_, |
250 core_handler_, | 250 core_handler_, |
251 gaia_screen_handler_); | 251 gaia_screen_handler_); |
252 AddScreenHandler(signin_screen_handler_); | 252 AddScreenHandler(signin_screen_handler_); |
253 | 253 |
254 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler = | 254 AppLaunchSplashScreenHandler* app_launch_splash_screen_handler = |
255 new AppLaunchSplashScreenHandler(); | 255 new AppLaunchSplashScreenHandler(network_state_informer_, |
| 256 error_screen_handler_); |
256 AddScreenHandler(app_launch_splash_screen_handler); | 257 AddScreenHandler(app_launch_splash_screen_handler); |
257 app_launch_splash_screen_actor_ = app_launch_splash_screen_handler; | 258 app_launch_splash_screen_actor_ = app_launch_splash_screen_handler; |
258 | 259 |
259 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. | 260 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. |
260 kiosk_app_menu_handler_ = new KioskAppMenuHandler; | 261 kiosk_app_menu_handler_ = new KioskAppMenuHandler; |
261 web_ui->AddMessageHandler(kiosk_app_menu_handler_); | 262 web_ui->AddMessageHandler(kiosk_app_menu_handler_); |
262 | 263 |
263 base::DictionaryValue localized_strings; | 264 base::DictionaryValue localized_strings; |
264 GetLocalizedStrings(&localized_strings); | 265 GetLocalizedStrings(&localized_strings); |
265 | 266 |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 observer_list_, | 473 observer_list_, |
473 OnCurrentScreenChanged(current_screen_, new_screen)); | 474 OnCurrentScreenChanged(current_screen_, new_screen)); |
474 current_screen_ = new_screen; | 475 current_screen_ = new_screen; |
475 } else { | 476 } else { |
476 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; | 477 NOTREACHED() << "Screen should be registered in InitializeScreenMaps()"; |
477 current_screen_ = SCREEN_UNKNOWN; | 478 current_screen_ = SCREEN_UNKNOWN; |
478 } | 479 } |
479 } | 480 } |
480 | 481 |
481 } // namespace chromeos | 482 } // namespace chromeos |
OLD | NEW |