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

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

Issue 2891223002: cros: Move wallpaper after login screen is gone (Closed)
Patch Set: fix nits Created 3 years, 7 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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, 290 IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
291 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); 291 base::FilePath(extension_misc::kConnectivityDiagnosticsPath));
292 292
293 const extensions::Extension* extension = 293 const extensions::Extension* extension =
294 extension_service->GetExtensionById(extension_id, true); 294 extension_service->GetExtensionById(extension_id, true);
295 OpenApplication(AppLaunchParams( 295 OpenApplication(AppLaunchParams(
296 profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, 296 profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
297 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL)); 297 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
298 KioskAppManager::Get()->InitSession(profile, extension_id); 298 KioskAppManager::Get()->InitSession(profile, extension_id);
299 299
300 session_manager::SessionManager::Get()->SessionStarted(); 300 LoginDisplayHost::default_host()->Finalize(base::BindOnce(
301 301 [] { session_manager::SessionManager::Get()->SessionStarted(); }));
302 LoginDisplayHost::default_host()->Finalize();
303 } 302 }
304 303
305 void ErrorScreen::OnLaunchOobeGuestSession() { 304 void ErrorScreen::OnLaunchOobeGuestSession() {
306 DeviceSettingsService::Get()->GetOwnershipStatusAsync( 305 DeviceSettingsService::Get()->GetOwnershipStatusAsync(
307 base::Bind(&ErrorScreen::StartGuestSessionAfterOwnershipCheck, 306 base::Bind(&ErrorScreen::StartGuestSessionAfterOwnershipCheck,
308 weak_factory_.GetWeakPtr())); 307 weak_factory_.GetWeakPtr()));
309 } 308 }
310 309
311 void ErrorScreen::OnLocalStateErrorPowerwashButtonClicked() { 310 void ErrorScreen::OnLocalStateErrorPowerwashButtonClicked() {
312 chromeos::DBusThreadManager::Get() 311 chromeos::DBusThreadManager::Get()
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 } 350 }
352 351
353 if (guest_login_performer_) 352 if (guest_login_performer_)
354 return; 353 return;
355 354
356 guest_login_performer_.reset(new ChromeLoginPerformer(this)); 355 guest_login_performer_.reset(new ChromeLoginPerformer(this));
357 guest_login_performer_->LoginOffTheRecord(); 356 guest_login_performer_->LoginOffTheRecord();
358 } 357 }
359 358
360 } // namespace chromeos 359 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698