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" |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, | 197 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, |
198 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath)); | 198 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath)); |
199 | 199 |
200 const extensions::Extension* extension = extension_service-> | 200 const extensions::Extension* extension = extension_service-> |
201 GetExtensionById(extension_id, true); | 201 GetExtensionById(extension_id, true); |
202 OpenApplication(AppLaunchParams(profile, extension, | 202 OpenApplication(AppLaunchParams(profile, extension, |
203 extensions::LAUNCH_CONTAINER_WINDOW, | 203 extensions::LAUNCH_CONTAINER_WINDOW, |
204 NEW_WINDOW)); | 204 NEW_WINDOW)); |
205 InitAppSession(profile, extension_id); | 205 InitAppSession(profile, extension_id); |
206 | 206 |
207 UserManager::Get()->SessionStarted(); | 207 GetUserManager()->SessionStarted(); |
208 | 208 |
209 LoginDisplayHostImpl::default_host()->Finalize(); | 209 LoginDisplayHostImpl::default_host()->Finalize(); |
210 } | 210 } |
211 | 211 |
212 void ErrorScreenHandler::HandleConfigureCerts() { | 212 void ErrorScreenHandler::HandleConfigureCerts() { |
213 CertificateManagerDialog* dialog = | 213 CertificateManagerDialog* dialog = |
214 new CertificateManagerDialog(ProfileManager::GetActiveUserProfile(), | 214 new CertificateManagerDialog(ProfileManager::GetActiveUserProfile(), |
215 NULL, | 215 NULL, |
216 GetNativeWindow()); | 216 GetNativeWindow()); |
217 dialog->Show(); | 217 dialog->Show(); |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 params.SetString("network", network_); | 287 params.SetString("network", network_); |
288 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); | 288 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); |
289 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); | 289 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); |
290 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_); | 290 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_); |
291 Show(parent_screen_, ¶ms); | 291 Show(parent_screen_, ¶ms); |
292 show_on_init_ = false; | 292 show_on_init_ = false; |
293 } | 293 } |
294 } | 294 } |
295 | 295 |
296 } // namespace chromeos | 296 } // namespace chromeos |
OLD | NEW |