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

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

Issue 2438063002: user_manager: Remove deps on session_manager (Closed)
Patch Set: fix nits in PS1 Created 4 years, 2 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"
11 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 11 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
12 #include "chrome/browser/extensions/component_loader.h" 12 #include "chrome/browser/extensions/component_loader.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/lifetime/application_lifetime.h" 14 #include "chrome/browser/lifetime/application_lifetime.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/extensions/app_launch_params.h" 16 #include "chrome/browser/ui/extensions/app_launch_params.h"
17 #include "chrome/browser/ui/extensions/application_launch.h" 17 #include "chrome/browser/ui/extensions/application_launch.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/extensions/extension_constants.h" 19 #include "chrome/common/extensions/extension_constants.h"
20 #include "chrome/grit/browser_resources.h" 20 #include "chrome/grit/browser_resources.h"
21 #include "chromeos/login/user_names.h" 21 #include "chromeos/login/user_names.h"
22 #include "chromeos/network/network_handler.h" 22 #include "chromeos/network/network_handler.h"
23 #include "chromeos/network/network_state_handler.h" 23 #include "chromeos/network/network_state_handler.h"
24 #include "components/session_manager/core/session_manager.h"
24 #include "components/signin/core/account_id/account_id.h" 25 #include "components/signin/core/account_id/account_id.h"
25 #include "components/user_manager/user_manager.h"
26 #include "extensions/browser/extension_system.h" 26 #include "extensions/browser/extension_system.h"
27 #include "extensions/common/constants.h" 27 #include "extensions/common/constants.h"
28 #include "extensions/common/extension.h" 28 #include "extensions/common/extension.h"
29 #include "ui/base/window_open_disposition.h" 29 #include "ui/base/window_open_disposition.h"
30 30
31 namespace chromeos { 31 namespace chromeos {
32 32
33 const char DemoAppLauncher::kDemoAppId[] = "klimoghijjogocdbaikffefjfcfheiel"; 33 const char DemoAppLauncher::kDemoAppId[] = "klimoghijjogocdbaikffefjfcfheiel";
34 const base::FilePath::CharType kDefaultDemoAppPath[] = 34 const base::FilePath::CharType kDefaultDemoAppPath[] =
35 FILE_PATH_LITERAL("/usr/share/chromeos-assets/demo_app"); 35 FILE_PATH_LITERAL("/usr/share/chromeos-assets/demo_app");
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 handler->SetTechnologyEnabled(NetworkTypePattern::NonVirtual(), 93 handler->SetTechnologyEnabled(NetworkTypePattern::NonVirtual(),
94 false, 94 false,
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 user_manager::UserManager::Get()->SessionStarted(); 103 session_manager::SessionManager::Get()->SessionStarted();
104 104
105 LoginDisplayHost::default_host()->Finalize(); 105 LoginDisplayHost::default_host()->Finalize();
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