Chromium Code Reviews| 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/user_session_manager.h" | 5 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 893 // Switch log file as soon as possible. | 893 // Switch log file as soon as possible. |
| 894 if (base::SysInfo::IsRunningOnChromeOS()) | 894 if (base::SysInfo::IsRunningOnChromeOS()) |
| 895 logging::RedirectChromeLogging(*(base::CommandLine::ForCurrentProcess())); | 895 logging::RedirectChromeLogging(*(base::CommandLine::ForCurrentProcess())); |
| 896 } | 896 } |
| 897 | 897 |
| 898 void UserSessionManager::StoreUserContextDataBeforeProfileIsCreated() { | 898 void UserSessionManager::StoreUserContextDataBeforeProfileIsCreated() { |
| 899 // Store obfuscated GAIA ID. | 899 // Store obfuscated GAIA ID. |
| 900 if (!user_context_.GetGaiaID().empty()) { | 900 if (!user_context_.GetGaiaID().empty()) { |
| 901 user_manager::known_user::UpdateGaiaID(user_context_.GetAccountId(), | 901 user_manager::known_user::UpdateGaiaID(user_context_.GetAccountId(), |
| 902 user_context_.GetGaiaID()); | 902 user_context_.GetGaiaID()); |
| 903 user_manager::known_user::UpdateAccountType(user_context_.GetAccountId()); | |
|
Andrew T Wilson (Slow)
2016/11/29 11:05:36
Why are you passing the account ID here as the acc
Roman Sorokin (ftl)
2016/12/02 11:13:10
GetAccountId returns AccountId class. Actually tha
| |
| 903 } | 904 } |
| 904 } | 905 } |
| 905 | 906 |
| 906 void UserSessionManager::StartCrosSession() { | 907 void UserSessionManager::StartCrosSession() { |
| 907 BootTimesRecorder* btl = BootTimesRecorder::Get(); | 908 BootTimesRecorder* btl = BootTimesRecorder::Get(); |
| 908 btl->AddLoginTimeMarker("StartSession-Start", false); | 909 btl->AddLoginTimeMarker("StartSession-Start", false); |
| 909 DBusThreadManager::Get()->GetSessionManagerClient()->StartSession( | 910 DBusThreadManager::Get()->GetSessionManagerClient()->StartSession( |
| 910 cryptohome::Identification(user_context_.GetAccountId())); | 911 cryptohome::Identification(user_context_.GetAccountId())); |
| 911 btl->AddLoginTimeMarker("StartSession-End", false); | 912 btl->AddLoginTimeMarker("StartSession-End", false); |
| 912 } | 913 } |
| (...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1870 ->browser_policy_connector_chromeos() | 1871 ->browser_policy_connector_chromeos() |
| 1871 ->IsEnterpriseManaged()) { | 1872 ->IsEnterpriseManaged()) { |
| 1872 return false; | 1873 return false; |
| 1873 } | 1874 } |
| 1874 | 1875 |
| 1875 // Do not show end of life notification if this is a guest session | 1876 // Do not show end of life notification if this is a guest session |
| 1876 return !profile->IsGuestSession(); | 1877 return !profile->IsGuestSession(); |
| 1877 } | 1878 } |
| 1878 | 1879 |
| 1879 } // namespace chromeos | 1880 } // namespace chromeos |
| OLD | NEW |