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/chromeos/login/screens/error_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 dialog->Show(); | 268 dialog->Show(); |
269 } | 269 } |
270 | 270 |
271 void ErrorScreen::OnDiagnoseButtonClicked() { | 271 void ErrorScreen::OnDiagnoseButtonClicked() { |
272 Profile* profile = GetAppProfile(); | 272 Profile* profile = GetAppProfile(); |
273 ExtensionService* extension_service = | 273 ExtensionService* extension_service = |
274 extensions::ExtensionSystem::Get(profile)->extension_service(); | 274 extensions::ExtensionSystem::Get(profile)->extension_service(); |
275 | 275 |
276 std::string extension_id = extension_service->component_loader()->Add( | 276 std::string extension_id = extension_service->component_loader()->Add( |
277 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, | 277 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, |
278 base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath)); | 278 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); |
279 | 279 |
280 const extensions::Extension* extension = | 280 const extensions::Extension* extension = |
281 extension_service->GetExtensionById(extension_id, true); | 281 extension_service->GetExtensionById(extension_id, true); |
282 OpenApplication( | 282 OpenApplication( |
283 AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, | 283 AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, |
284 NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); | 284 NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); |
285 InitAppSession(profile, extension_id); | 285 InitAppSession(profile, extension_id); |
286 | 286 |
287 user_manager::UserManager::Get()->SessionStarted(); | 287 user_manager::UserManager::Get()->SessionStarted(); |
288 | 288 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 } | 334 } |
335 | 335 |
336 if (guest_login_performer_) | 336 if (guest_login_performer_) |
337 return; | 337 return; |
338 | 338 |
339 guest_login_performer_.reset(new ChromeLoginPerformer(this)); | 339 guest_login_performer_.reset(new ChromeLoginPerformer(this)); |
340 guest_login_performer_->LoginOffTheRecord(); | 340 guest_login_performer_->LoginOffTheRecord(); |
341 } | 341 } |
342 | 342 |
343 } // namespace chromeos | 343 } // namespace chromeos |
OLD | NEW |