| OLD | NEW |
| 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/session/chrome_session_manager.h" | 5 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 150 |
| 151 ChromeSessionManager::ChromeSessionManager() {} | 151 ChromeSessionManager::ChromeSessionManager() {} |
| 152 ChromeSessionManager::~ChromeSessionManager() {} | 152 ChromeSessionManager::~ChromeSessionManager() {} |
| 153 | 153 |
| 154 void ChromeSessionManager::Initialize( | 154 void ChromeSessionManager::Initialize( |
| 155 const base::CommandLine& parsed_command_line, | 155 const base::CommandLine& parsed_command_line, |
| 156 Profile* profile, | 156 Profile* profile, |
| 157 bool is_running_test) { | 157 bool is_running_test) { |
| 158 // Keep Chrome alive for mash. | 158 // Keep Chrome alive for mash. |
| 159 // TODO(xiyuan): Remove this when session manager is moved out of Chrome. | 159 // TODO(xiyuan): Remove this when session manager is moved out of Chrome. |
| 160 if (ash_util::IsRunningInMash() && | 160 if (IsRunningInMash() && |
| 161 !base::CommandLine::ForCurrentProcess()->HasSwitch( | 161 !base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 162 ::switches::kDisableZeroBrowsersOpenForTests)) { | 162 ::switches::kDisableZeroBrowsersOpenForTests)) { |
| 163 g_browser_process->platform_part()->RegisterKeepAlive(); | 163 g_browser_process->platform_part()->RegisterKeepAlive(); |
| 164 } | 164 } |
| 165 | 165 |
| 166 // Tests should be able to tune login manager before showing it. Thus only | 166 // Tests should be able to tune login manager before showing it. Thus only |
| 167 // show login UI (login and out-of-box) in normal (non-testing) mode with | 167 // show login UI (login and out-of-box) in normal (non-testing) mode with |
| 168 // --login-manager switch and if test passed --force-login-manager-in-tests. | 168 // --login-manager switch and if test passed --force-login-manager-in-tests. |
| 169 bool force_login_screen_in_test = | 169 bool force_login_screen_in_test = |
| 170 parsed_command_line.HasSwitch(switches::kForceLoginManagerInTests); | 170 parsed_command_line.HasSwitch(switches::kForceLoginManagerInTests); |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 const std::string& user_id_hash, | 230 const std::string& user_id_hash, |
| 231 bool browser_restart) { | 231 bool browser_restart) { |
| 232 BootTimesRecorder* btl = BootTimesRecorder::Get(); | 232 BootTimesRecorder* btl = BootTimesRecorder::Get(); |
| 233 btl->AddLoginTimeMarker("UserLoggedIn-Start", false); | 233 btl->AddLoginTimeMarker("UserLoggedIn-Start", false); |
| 234 session_manager::SessionManager::NotifyUserLoggedIn( | 234 session_manager::SessionManager::NotifyUserLoggedIn( |
| 235 user_account_id, user_id_hash, browser_restart); | 235 user_account_id, user_id_hash, browser_restart); |
| 236 btl->AddLoginTimeMarker("UserLoggedIn-End", false); | 236 btl->AddLoginTimeMarker("UserLoggedIn-End", false); |
| 237 } | 237 } |
| 238 | 238 |
| 239 } // namespace chromeos | 239 } // namespace chromeos |
| OLD | NEW |