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/login_display_host_impl.h" | 13 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
14 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 14 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
15 #include "chrome/browser/extensions/component_loader.h" | 15 #include "chrome/browser/extensions/component_loader.h" |
16 #include "chrome/browser/extensions/extension_service.h" | 16 #include "chrome/browser/extensions/extension_service.h" |
17 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
| 18 #include "chrome/browser/ui/extensions/app_launch_params.h" |
18 #include "chrome/browser/ui/extensions/application_launch.h" | 19 #include "chrome/browser/ui/extensions/application_launch.h" |
19 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" | 20 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" |
20 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" | 21 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" |
21 #include "chrome/common/extensions/extension_constants.h" | 22 #include "chrome/common/extensions/extension_constants.h" |
22 #include "chrome/grit/chromium_strings.h" | 23 #include "chrome/grit/chromium_strings.h" |
23 #include "chrome/grit/generated_resources.h" | 24 #include "chrome/grit/generated_resources.h" |
24 #include "chromeos/dbus/dbus_thread_manager.h" | 25 #include "chromeos/dbus/dbus_thread_manager.h" |
25 #include "chromeos/dbus/power_manager_client.h" | 26 #include "chromeos/dbus/power_manager_client.h" |
26 #include "chromeos/dbus/session_manager_client.h" | 27 #include "chromeos/dbus/session_manager_client.h" |
27 #include "chromeos/network/portal_detector/network_portal_detector.h" | 28 #include "chromeos/network/portal_detector/network_portal_detector.h" |
28 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" | 29 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" |
29 #include "components/user_manager/user_manager.h" | 30 #include "components/user_manager/user_manager.h" |
30 #include "extensions/browser/extension_system.h" | 31 #include "extensions/browser/extension_system.h" |
| 32 #include "extensions/common/constants.h" |
31 #include "grit/browser_resources.h" | 33 #include "grit/browser_resources.h" |
32 #include "ui/strings/grit/ui_strings.h" | 34 #include "ui/strings/grit/ui_strings.h" |
33 | 35 |
34 #if !defined(USE_ATHENA) | 36 #if !defined(USE_ATHENA) |
35 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" | 37 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" |
36 #endif | 38 #endif |
37 | 39 |
38 namespace { | 40 namespace { |
39 | 41 |
40 const char kJsScreenPath[] = "login.ErrorMessageScreen"; | 42 const char kJsScreenPath[] = "login.ErrorMessageScreen"; |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 ExtensionService* extension_service = | 213 ExtensionService* extension_service = |
212 extensions::ExtensionSystem::Get(profile)->extension_service(); | 214 extensions::ExtensionSystem::Get(profile)->extension_service(); |
213 | 215 |
214 std::string extension_id = | 216 std::string extension_id = |
215 extension_service->component_loader()->Add( | 217 extension_service->component_loader()->Add( |
216 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, | 218 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, |
217 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath)); | 219 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath)); |
218 | 220 |
219 const extensions::Extension* extension = extension_service-> | 221 const extensions::Extension* extension = extension_service-> |
220 GetExtensionById(extension_id, true); | 222 GetExtensionById(extension_id, true); |
221 OpenApplication(AppLaunchParams(profile, extension, | 223 OpenApplication( |
222 extensions::LAUNCH_CONTAINER_WINDOW, | 224 AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, |
223 NEW_WINDOW)); | 225 NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); |
224 InitAppSession(profile, extension_id); | 226 InitAppSession(profile, extension_id); |
225 | 227 |
226 user_manager::UserManager::Get()->SessionStarted(); | 228 user_manager::UserManager::Get()->SessionStarted(); |
227 | 229 |
228 LoginDisplayHostImpl::default_host()->Finalize(); | 230 LoginDisplayHostImpl::default_host()->Finalize(); |
229 } | 231 } |
230 | 232 |
231 void ErrorScreenHandler::HandleConfigureCerts() { | 233 void ErrorScreenHandler::HandleConfigureCerts() { |
232 CertificateManagerDialog* dialog = | 234 CertificateManagerDialog* dialog = |
233 new CertificateManagerDialog(ProfileManager::GetActiveUserProfile(), | 235 new CertificateManagerDialog(ProfileManager::GetActiveUserProfile(), |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 params.SetString("network", network_); | 308 params.SetString("network", network_); |
307 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); | 309 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); |
308 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); | 310 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); |
309 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_); | 311 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_); |
310 Show(parent_screen_, ¶ms); | 312 Show(parent_screen_, ¶ms); |
311 show_on_init_ = false; | 313 show_on_init_ = false; |
312 } | 314 } |
313 } | 315 } |
314 | 316 |
315 } // namespace chromeos | 317 } // namespace chromeos |
OLD | NEW |