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

Side by Side Diff: chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc

Issue 2935623003: Merge "cros: Move wallpaper after login screen is gone" (Closed)
Patch Set: Created 3 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/demo_mode/demo_app_launcher.h" 5 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 10 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 chromeos::network_handler::ErrorCallback()); 95 chromeos::network_handler::ErrorCallback());
96 96
97 OpenApplication(AppLaunchParams(profile, extension, 97 OpenApplication(AppLaunchParams(profile, extension,
98 extensions::LAUNCH_CONTAINER_WINDOW, 98 extensions::LAUNCH_CONTAINER_WINDOW,
99 WindowOpenDisposition::NEW_WINDOW, 99 WindowOpenDisposition::NEW_WINDOW,
100 extensions::SOURCE_CHROME_INTERNAL, true)); 100 extensions::SOURCE_CHROME_INTERNAL, true));
101 KioskAppManager::Get()->InitSession(profile, extension_id); 101 KioskAppManager::Get()->InitSession(profile, extension_id);
102 102
103 session_manager::SessionManager::Get()->SessionStarted(); 103 session_manager::SessionManager::Get()->SessionStarted();
104 104
105 LoginDisplayHost::default_host()->Finalize(); 105 LoginDisplayHost::default_host()->Finalize(base::OnceClosure());
106 } 106 }
107 107
108 void DemoAppLauncher::OnProfileLoadFailed(KioskAppLaunchError::Error error) { 108 void DemoAppLauncher::OnProfileLoadFailed(KioskAppLaunchError::Error error) {
109 LOG(ERROR) << "Loading the Kiosk Profile failed: " << 109 LOG(ERROR) << "Loading the Kiosk Profile failed: " <<
110 KioskAppLaunchError::GetErrorMessage(error); 110 KioskAppLaunchError::GetErrorMessage(error);
111 } 111 }
112 112
113 } // namespace chromeos 113 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698