| 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/error_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| 11 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h" | 11 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h" |
| 12 #include "chrome/browser/chromeos/app_mode/certificate_manager_dialog.h" | 12 #include "chrome/browser/chromeos/app_mode/certificate_manager_dialog.h" |
| 13 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" | 13 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" |
| 14 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 14 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
| 15 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 15 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
| 16 #include "chrome/browser/extensions/component_loader.h" | 16 #include "chrome/browser/extensions/component_loader.h" |
| 17 #include "chrome/browser/extensions/extension_service.h" | 17 #include "chrome/browser/extensions/extension_service.h" |
| 18 #include "chrome/browser/ui/extensions/application_launch.h" | 18 #include "chrome/browser/ui/extensions/application_launch.h" |
| 19 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" | 19 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" |
| 20 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" | 20 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" |
| 21 #include "chromeos/dbus/dbus_thread_manager.h" | 21 #include "chromeos/dbus/dbus_thread_manager.h" |
| 22 #include "chromeos/dbus/power_manager_client.h" | 22 #include "chromeos/dbus/power_manager_client.h" |
| 23 #include "chromeos/dbus/session_manager_client.h" | 23 #include "chromeos/dbus/session_manager_client.h" |
| 24 #include "chromeos/network/portal_detector/network_portal_detector.h" | 24 #include "chromeos/network/portal_detector/network_portal_detector.h" |
| 25 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" | 25 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" |
| 26 #include "components/user_manager/user_manager.h" |
| 26 #include "extensions/browser/extension_system.h" | 27 #include "extensions/browser/extension_system.h" |
| 27 #include "grit/browser_resources.h" | 28 #include "grit/browser_resources.h" |
| 28 #include "grit/chromium_strings.h" | 29 #include "grit/chromium_strings.h" |
| 29 #include "grit/generated_resources.h" | 30 #include "grit/generated_resources.h" |
| 30 #include "grit/ui_strings.h" | 31 #include "grit/ui_strings.h" |
| 31 | 32 |
| 32 namespace { | 33 namespace { |
| 33 | 34 |
| 34 const char kJsScreenPath[] = "login.ErrorMessageScreen"; | 35 const char kJsScreenPath[] = "login.ErrorMessageScreen"; |
| 35 | 36 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, | 198 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, |
| 198 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath)); | 199 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath)); |
| 199 | 200 |
| 200 const extensions::Extension* extension = extension_service-> | 201 const extensions::Extension* extension = extension_service-> |
| 201 GetExtensionById(extension_id, true); | 202 GetExtensionById(extension_id, true); |
| 202 OpenApplication(AppLaunchParams(profile, extension, | 203 OpenApplication(AppLaunchParams(profile, extension, |
| 203 extensions::LAUNCH_CONTAINER_WINDOW, | 204 extensions::LAUNCH_CONTAINER_WINDOW, |
| 204 NEW_WINDOW)); | 205 NEW_WINDOW)); |
| 205 InitAppSession(profile, extension_id); | 206 InitAppSession(profile, extension_id); |
| 206 | 207 |
| 207 UserManager::Get()->SessionStarted(); | 208 user_manager::UserManager::Get()->SessionStarted(); |
| 208 | 209 |
| 209 LoginDisplayHostImpl::default_host()->Finalize(); | 210 LoginDisplayHostImpl::default_host()->Finalize(); |
| 210 } | 211 } |
| 211 | 212 |
| 212 void ErrorScreenHandler::HandleConfigureCerts() { | 213 void ErrorScreenHandler::HandleConfigureCerts() { |
| 213 CertificateManagerDialog* dialog = | 214 CertificateManagerDialog* dialog = |
| 214 new CertificateManagerDialog(ProfileManager::GetActiveUserProfile(), | 215 new CertificateManagerDialog(ProfileManager::GetActiveUserProfile(), |
| 215 NULL, | 216 NULL, |
| 216 GetNativeWindow()); | 217 GetNativeWindow()); |
| 217 dialog->Show(); | 218 dialog->Show(); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 params.SetString("network", network_); | 288 params.SetString("network", network_); |
| 288 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); | 289 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); |
| 289 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); | 290 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); |
| 290 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_); | 291 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_); |
| 291 Show(parent_screen_, ¶ms); | 292 Show(parent_screen_, ¶ms); |
| 292 show_on_init_ = false; | 293 show_on_init_ = false; |
| 293 } | 294 } |
| 294 } | 295 } |
| 295 | 296 |
| 296 } // namespace chromeos | 297 } // namespace chromeos |
| OLD | NEW |