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

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

Issue 2529103002: Add account_type into AccountId (Closed)
Patch Set: Fix MultiUserWindowManagerChromeOSTest.* 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 881 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 // Switch log file as soon as possible. 892 // Switch log file as soon as possible.
893 if (base::SysInfo::IsRunningOnChromeOS()) 893 if (base::SysInfo::IsRunningOnChromeOS())
894 logging::RedirectChromeLogging(*(base::CommandLine::ForCurrentProcess())); 894 logging::RedirectChromeLogging(*(base::CommandLine::ForCurrentProcess()));
895 } 895 }
896 896
897 void UserSessionManager::StoreUserContextDataBeforeProfileIsCreated() { 897 void UserSessionManager::StoreUserContextDataBeforeProfileIsCreated() {
898 // Store obfuscated GAIA ID. 898 // Store obfuscated GAIA ID.
899 if (!user_context_.GetGaiaID().empty()) { 899 if (!user_context_.GetGaiaID().empty()) {
900 user_manager::known_user::UpdateGaiaID(user_context_.GetAccountId(), 900 user_manager::known_user::UpdateGaiaID(user_context_.GetAccountId(),
901 user_context_.GetGaiaID()); 901 user_context_.GetGaiaID());
902 user_manager::known_user::UpdateAccountType(user_context_.GetAccountId());
902 } 903 }
903 } 904 }
904 905
905 void UserSessionManager::StartCrosSession() { 906 void UserSessionManager::StartCrosSession() {
906 BootTimesRecorder* btl = BootTimesRecorder::Get(); 907 BootTimesRecorder* btl = BootTimesRecorder::Get();
907 btl->AddLoginTimeMarker("StartSession-Start", false); 908 btl->AddLoginTimeMarker("StartSession-Start", false);
908 DBusThreadManager::Get()->GetSessionManagerClient()->StartSession( 909 DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
909 cryptohome::Identification(user_context_.GetAccountId())); 910 cryptohome::Identification(user_context_.GetAccountId()));
910 btl->AddLoginTimeMarker("StartSession-End", false); 911 btl->AddLoginTimeMarker("StartSession-End", false);
911 } 912 }
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
1845 ->browser_policy_connector_chromeos() 1846 ->browser_policy_connector_chromeos()
1846 ->IsEnterpriseManaged()) { 1847 ->IsEnterpriseManaged()) {
1847 return false; 1848 return false;
1848 } 1849 }
1849 1850
1850 // Do not show end of life notification if this is a guest session 1851 // Do not show end of life notification if this is a guest session
1851 return !profile->IsGuestSession(); 1852 return !profile->IsGuestSession();
1852 } 1853 }
1853 1854
1854 } // namespace chromeos 1855 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698