OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/app_mode/kiosk_app_launcher.h" | 5 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h" |
6 | 6 |
7 #include "base/chromeos/chromeos_version.h" | 7 #include "base/chromeos/chromeos_version.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 return; | 130 return; |
131 } | 131 } |
132 LoginUtils::Get()->PrepareProfile( | 132 LoginUtils::Get()->PrepareProfile( |
133 UserContext(user_id_, | 133 UserContext(user_id_, |
134 std::string(), // password | 134 std::string(), // password |
135 std::string(), // auth_code | 135 std::string(), // auth_code |
136 username_hash), | 136 username_hash), |
137 std::string(), // display email | 137 std::string(), // display email |
138 false, // using_oauth | 138 false, // using_oauth |
139 false, // has_cookies | 139 false, // has_cookies |
| 140 false, // has_active_session |
140 this); | 141 this); |
141 } | 142 } |
142 | 143 |
143 // LoginUtils::Delegate overrides: | 144 // LoginUtils::Delegate overrides: |
144 virtual void OnProfilePrepared(Profile* profile) OVERRIDE { | 145 virtual void OnProfilePrepared(Profile* profile) OVERRIDE { |
145 kiosk_app_launcher_->OnProfilePrepared(profile); | 146 kiosk_app_launcher_->OnProfilePrepared(profile); |
146 } | 147 } |
147 | 148 |
148 KioskAppLauncher* kiosk_app_launcher_; | 149 KioskAppLauncher* kiosk_app_launcher_; |
149 std::string user_id_; | 150 std::string user_id_; |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 (new chromeos::StartupAppLauncher(profile, app_id_))->Start(); | 255 (new chromeos::StartupAppLauncher(profile, app_id_))->Start(); |
255 | 256 |
256 if (LoginDisplayHostImpl::default_host()) | 257 if (LoginDisplayHostImpl::default_host()) |
257 LoginDisplayHostImpl::default_host()->OnSessionStart(); | 258 LoginDisplayHostImpl::default_host()->OnSessionStart(); |
258 UserManager::Get()->SessionStarted(); | 259 UserManager::Get()->SessionStarted(); |
259 | 260 |
260 ReportLaunchResult(KioskAppLaunchError::NONE); | 261 ReportLaunchResult(KioskAppLaunchError::NONE); |
261 } | 262 } |
262 | 263 |
263 } // namespace chromeos | 264 } // namespace chromeos |
OLD | NEW |