Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc

Issue 720633003: Revert of CL 722703002 due to build breakage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
19 #include "chrome/browser/ui/extensions/application_launch.h" 18 #include "chrome/browser/ui/extensions/application_launch.h"
20 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" 19 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
21 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 20 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
22 #include "chrome/common/extensions/extension_constants.h" 21 #include "chrome/common/extensions/extension_constants.h"
23 #include "chrome/grit/chromium_strings.h" 22 #include "chrome/grit/chromium_strings.h"
24 #include "chrome/grit/generated_resources.h" 23 #include "chrome/grit/generated_resources.h"
25 #include "chromeos/dbus/dbus_thread_manager.h" 24 #include "chromeos/dbus/dbus_thread_manager.h"
26 #include "chromeos/dbus/power_manager_client.h" 25 #include "chromeos/dbus/power_manager_client.h"
27 #include "chromeos/dbus/session_manager_client.h" 26 #include "chromeos/dbus/session_manager_client.h"
28 #include "chromeos/network/portal_detector/network_portal_detector.h" 27 #include "chromeos/network/portal_detector/network_portal_detector.h"
29 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" 28 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
30 #include "components/user_manager/user_manager.h" 29 #include "components/user_manager/user_manager.h"
31 #include "extensions/browser/extension_system.h" 30 #include "extensions/browser/extension_system.h"
32 #include "extensions/common/constants.h"
33 #include "grit/browser_resources.h" 31 #include "grit/browser_resources.h"
34 #include "ui/strings/grit/ui_strings.h" 32 #include "ui/strings/grit/ui_strings.h"
35 33
36 #if !defined(USE_ATHENA) 34 #if !defined(USE_ATHENA)
37 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" 35 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"
38 #endif 36 #endif
39 37
40 namespace { 38 namespace {
41 39
42 const char kJsScreenPath[] = "login.ErrorMessageScreen"; 40 const char kJsScreenPath[] = "login.ErrorMessageScreen";
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 ExtensionService* extension_service = 211 ExtensionService* extension_service =
214 extensions::ExtensionSystem::Get(profile)->extension_service(); 212 extensions::ExtensionSystem::Get(profile)->extension_service();
215 213
216 std::string extension_id = 214 std::string extension_id =
217 extension_service->component_loader()->Add( 215 extension_service->component_loader()->Add(
218 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, 216 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
219 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath)); 217 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath));
220 218
221 const extensions::Extension* extension = extension_service-> 219 const extensions::Extension* extension = extension_service->
222 GetExtensionById(extension_id, true); 220 GetExtensionById(extension_id, true);
223 OpenApplication( 221 OpenApplication(AppLaunchParams(profile, extension,
224 AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, 222 extensions::LAUNCH_CONTAINER_WINDOW,
225 NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); 223 NEW_WINDOW));
226 InitAppSession(profile, extension_id); 224 InitAppSession(profile, extension_id);
227 225
228 user_manager::UserManager::Get()->SessionStarted(); 226 user_manager::UserManager::Get()->SessionStarted();
229 227
230 LoginDisplayHostImpl::default_host()->Finalize(); 228 LoginDisplayHostImpl::default_host()->Finalize();
231 } 229 }
232 230
233 void ErrorScreenHandler::HandleConfigureCerts() { 231 void ErrorScreenHandler::HandleConfigureCerts() {
234 CertificateManagerDialog* dialog = 232 CertificateManagerDialog* dialog =
235 new CertificateManagerDialog(ProfileManager::GetActiveUserProfile(), 233 new CertificateManagerDialog(ProfileManager::GetActiveUserProfile(),
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 params.SetString("network", network_); 306 params.SetString("network", network_);
309 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); 307 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_);
310 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); 308 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_);
311 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_); 309 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_);
312 Show(parent_screen_, &params); 310 Show(parent_screen_, &params);
313 show_on_init_ = false; 311 show_on_init_ = false;
314 } 312 }
315 } 313 }
316 314
317 } // namespace chromeos 315 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698