| 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/chromeos/kiosk_mode/kiosk_mode_settings.h" | 10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 AddScreenHandler(handler); | 278 AddScreenHandler(handler); |
| 279 } | 279 } |
| 280 | 280 |
| 281 if (display_type_ == kOobeDisplay) { | 281 if (display_type_ == kOobeDisplay) { |
| 282 HostPairingScreenHandler* handler = new HostPairingScreenHandler(); | 282 HostPairingScreenHandler* handler = new HostPairingScreenHandler(); |
| 283 host_pairing_screen_actor_ = handler; | 283 host_pairing_screen_actor_ = handler; |
| 284 AddScreenHandler(handler); | 284 AddScreenHandler(handler); |
| 285 } | 285 } |
| 286 | 286 |
| 287 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. | 287 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. |
| 288 kiosk_app_menu_handler_ = new KioskAppMenuHandler; | 288 kiosk_app_menu_handler_ = new KioskAppMenuHandler(network_state_informer_); |
| 289 web_ui->AddMessageHandler(kiosk_app_menu_handler_); | 289 web_ui->AddMessageHandler(kiosk_app_menu_handler_); |
| 290 | 290 |
| 291 base::DictionaryValue localized_strings; | 291 base::DictionaryValue localized_strings; |
| 292 GetLocalizedStrings(&localized_strings); | 292 GetLocalizedStrings(&localized_strings); |
| 293 | 293 |
| 294 Profile* profile = Profile::FromWebUI(web_ui); | 294 Profile* profile = Profile::FromWebUI(web_ui); |
| 295 // Set up the chrome://theme/ source, for Chrome logo. | 295 // Set up the chrome://theme/ source, for Chrome logo. |
| 296 ThemeSource* theme = new ThemeSource(profile); | 296 ThemeSource* theme = new ThemeSource(profile); |
| 297 content::URLDataSource::Add(profile, theme); | 297 content::URLDataSource::Add(profile, theme); |
| 298 | 298 |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 DCHECK(screen_ids_.count(screen)) | 530 DCHECK(screen_ids_.count(screen)) |
| 531 << "Screen should be registered in InitializeScreenMaps()"; | 531 << "Screen should be registered in InitializeScreenMaps()"; |
| 532 Screen new_screen = screen_ids_[screen]; | 532 Screen new_screen = screen_ids_[screen]; |
| 533 FOR_EACH_OBSERVER(Observer, | 533 FOR_EACH_OBSERVER(Observer, |
| 534 observer_list_, | 534 observer_list_, |
| 535 OnCurrentScreenChanged(current_screen_, new_screen)); | 535 OnCurrentScreenChanged(current_screen_, new_screen)); |
| 536 current_screen_ = new_screen; | 536 current_screen_ = new_screen; |
| 537 } | 537 } |
| 538 | 538 |
| 539 } // namespace chromeos | 539 } // namespace chromeos |
| OLD | NEW |