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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 2529103002: Add account_type into AccountId (Closed)
Patch Set: more tests Created 4 years 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/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 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 user_context_.GetAccountId(), user_context_.GetUserIDHash()); 890 user_context_.GetAccountId(), user_context_.GetUserIDHash());
891 } 891 }
892 892
893 void UserSessionManager::PreStartSession() { 893 void UserSessionManager::PreStartSession() {
894 // Switch log file as soon as possible. 894 // Switch log file as soon as possible.
895 if (base::SysInfo::IsRunningOnChromeOS()) 895 if (base::SysInfo::IsRunningOnChromeOS())
896 logging::RedirectChromeLogging(*(base::CommandLine::ForCurrentProcess())); 896 logging::RedirectChromeLogging(*(base::CommandLine::ForCurrentProcess()));
897 } 897 }
898 898
899 void UserSessionManager::StoreUserContextDataBeforeProfileIsCreated() { 899 void UserSessionManager::StoreUserContextDataBeforeProfileIsCreated() {
900 // Store obfuscated GAIA ID. 900 user_manager::known_user::UpdateId(user_context_.GetAccountId());
901 if (!user_context_.GetGaiaID().empty()) {
902 user_manager::known_user::UpdateGaiaID(user_context_.GetAccountId(),
903 user_context_.GetGaiaID());
904 }
905 } 901 }
906 902
907 void UserSessionManager::StartCrosSession() { 903 void UserSessionManager::StartCrosSession() {
908 BootTimesRecorder* btl = BootTimesRecorder::Get(); 904 BootTimesRecorder* btl = BootTimesRecorder::Get();
909 btl->AddLoginTimeMarker("StartSession-Start", false); 905 btl->AddLoginTimeMarker("StartSession-Start", false);
910 DBusThreadManager::Get()->GetSessionManagerClient()->StartSession( 906 DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
911 cryptohome::Identification(user_context_.GetAccountId())); 907 cryptohome::Identification(user_context_.GetAccountId()));
912 btl->AddLoginTimeMarker("StartSession-End", false); 908 btl->AddLoginTimeMarker("StartSession-End", false);
913 } 909 }
914 910
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
1838 ->browser_policy_connector_chromeos() 1834 ->browser_policy_connector_chromeos()
1839 ->IsEnterpriseManaged()) { 1835 ->IsEnterpriseManaged()) {
1840 return false; 1836 return false;
1841 } 1837 }
1842 1838
1843 // Do not show end of life notification if this is a guest session 1839 // Do not show end of life notification if this is a guest session
1844 return !profile->IsGuestSession(); 1840 return !profile->IsGuestSession();
1845 } 1841 }
1846 1842
1847 } // namespace chromeos 1843 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698