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

Side by Side Diff: chrome/browser/chromeos/login/screens/error_screen.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 months 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/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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 Profile* profile = GetAppProfile(); 271 Profile* profile = GetAppProfile();
272 ExtensionService* extension_service = 272 ExtensionService* extension_service =
273 extensions::ExtensionSystem::Get(profile)->extension_service(); 273 extensions::ExtensionSystem::Get(profile)->extension_service();
274 274
275 std::string extension_id = extension_service->component_loader()->Add( 275 std::string extension_id = extension_service->component_loader()->Add(
276 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, 276 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
277 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); 277 base::FilePath(extension_misc::kConnectivityDiagnosticsPath));
278 278
279 const extensions::Extension* extension = 279 const extensions::Extension* extension =
280 extension_service->GetExtensionById(extension_id, true); 280 extension_service->GetExtensionById(extension_id, true);
281 OpenApplication( 281 OpenApplication(AppLaunchParams(
282 AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, 282 profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
283 NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); 283 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
284 KioskAppManager::Get()->InitSession(profile, extension_id); 284 KioskAppManager::Get()->InitSession(profile, extension_id);
285 285
286 user_manager::UserManager::Get()->SessionStarted(); 286 user_manager::UserManager::Get()->SessionStarted();
287 287
288 LoginDisplayHost::default_host()->Finalize(); 288 LoginDisplayHost::default_host()->Finalize();
289 } 289 }
290 290
291 void ErrorScreen::OnLaunchOobeGuestSession() { 291 void ErrorScreen::OnLaunchOobeGuestSession() {
292 DeviceSettingsService::Get()->GetOwnershipStatusAsync( 292 DeviceSettingsService::Get()->GetOwnershipStatusAsync(
293 base::Bind(&ErrorScreen::StartGuestSessionAfterOwnershipCheck, 293 base::Bind(&ErrorScreen::StartGuestSessionAfterOwnershipCheck,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 } 337 }
338 338
339 if (guest_login_performer_) 339 if (guest_login_performer_)
340 return; 340 return;
341 341
342 guest_login_performer_.reset(new ChromeLoginPerformer(this)); 342 guest_login_performer_.reset(new ChromeLoginPerformer(this));
343 guest_login_performer_->LoginOffTheRecord(); 343 guest_login_performer_->LoginOffTheRecord();
344 } 344 }
345 345
346 } // namespace chromeos 346 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698