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

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

Issue 2901173002: Move RedirectChromeLogging to src/chromeos. (Closed)
Patch Set: Rebase Created 3 years, 6 months 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
« no previous file with comments | « chrome/browser/chromeos/logging.cc ('k') | chrome/common/logging_chrome.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 19 matching lines...) Expand all
30 #include "chrome/browser/browser_process_platform_part_chromeos.h" 30 #include "chrome/browser/browser_process_platform_part_chromeos.h"
31 #include "chrome/browser/browser_shutdown.h" 31 #include "chrome/browser/browser_shutdown.h"
32 #include "chrome/browser/chrome_notification_types.h" 32 #include "chrome/browser/chrome_notification_types.h"
33 #include "chrome/browser/chromeos/arc/arc_migration_guide_notification.h" 33 #include "chrome/browser/chromeos/arc/arc_migration_guide_notification.h"
34 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" 34 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
35 #include "chrome/browser/chromeos/arc/arc_util.h" 35 #include "chrome/browser/chromeos/arc/arc_util.h"
36 #include "chrome/browser/chromeos/base/locale_util.h" 36 #include "chrome/browser/chromeos/base/locale_util.h"
37 #include "chrome/browser/chromeos/boot_times_recorder.h" 37 #include "chrome/browser/chromeos/boot_times_recorder.h"
38 #include "chrome/browser/chromeos/first_run/first_run.h" 38 #include "chrome/browser/chromeos/first_run/first_run.h"
39 #include "chrome/browser/chromeos/first_run/goodies_displayer.h" 39 #include "chrome/browser/chromeos/first_run/goodies_displayer.h"
40 #include "chrome/browser/chromeos/logging.h"
40 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" 41 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
41 #include "chrome/browser/chromeos/login/chrome_restart_request.h" 42 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
42 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 43 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
43 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" 44 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
44 #include "chrome/browser/chromeos/login/existing_user_controller.h" 45 #include "chrome/browser/chromeos/login/existing_user_controller.h"
45 #include "chrome/browser/chromeos/login/helper.h" 46 #include "chrome/browser/chromeos/login/helper.h"
46 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 47 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
47 #include "chrome/browser/chromeos/login/profile_auth_data.h" 48 #include "chrome/browser/chromeos/login/profile_auth_data.h"
48 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" 49 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
49 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory .h" 50 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory .h"
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 has_auth_cookies_ = has_auth_cookies; 974 has_auth_cookies_ = has_auth_cookies;
974 InitSessionRestoreStrategy(); 975 InitSessionRestoreStrategy();
975 StoreUserContextDataBeforeProfileIsCreated(); 976 StoreUserContextDataBeforeProfileIsCreated();
976 session_manager::SessionManager::Get()->CreateSession( 977 session_manager::SessionManager::Get()->CreateSession(
977 user_context_.GetAccountId(), user_context_.GetUserIDHash()); 978 user_context_.GetAccountId(), user_context_.GetUserIDHash());
978 } 979 }
979 980
980 void UserSessionManager::PreStartSession() { 981 void UserSessionManager::PreStartSession() {
981 // Switch log file as soon as possible. 982 // Switch log file as soon as possible.
982 if (base::SysInfo::IsRunningOnChromeOS()) 983 if (base::SysInfo::IsRunningOnChromeOS())
983 logging::RedirectChromeLogging(*(base::CommandLine::ForCurrentProcess())); 984 logging::RedirectChromeLogging(*base::CommandLine::ForCurrentProcess());
984 } 985 }
985 986
986 void UserSessionManager::StoreUserContextDataBeforeProfileIsCreated() { 987 void UserSessionManager::StoreUserContextDataBeforeProfileIsCreated() {
987 user_manager::known_user::UpdateId(user_context_.GetAccountId()); 988 user_manager::known_user::UpdateId(user_context_.GetAccountId());
988 } 989 }
989 990
990 void UserSessionManager::StartCrosSession() { 991 void UserSessionManager::StartCrosSession() {
991 BootTimesRecorder* btl = BootTimesRecorder::Get(); 992 BootTimesRecorder* btl = BootTimesRecorder::Get();
992 btl->AddLoginTimeMarker("StartSession-Start", false); 993 btl->AddLoginTimeMarker("StartSession-Start", false);
993 DBusThreadManager::Get()->GetSessionManagerClient()->StartSession( 994 DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 ->browser_policy_connector_chromeos() 1963 ->browser_policy_connector_chromeos()
1963 ->IsEnterpriseManaged()) { 1964 ->IsEnterpriseManaged()) {
1964 return false; 1965 return false;
1965 } 1966 }
1966 1967
1967 // Do not show end of life notification if this is a guest session 1968 // Do not show end of life notification if this is a guest session
1968 return !profile->IsGuestSession(); 1969 return !profile->IsGuestSession();
1969 } 1970 }
1970 1971
1971 } // namespace chromeos 1972 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/logging.cc ('k') | chrome/common/logging_chrome.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698