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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 50 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" | 50 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" |
| 51 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" | 51 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" |
| 52 #include "chrome/browser/chromeos/login/signin/token_handle_fetcher.h" | 52 #include "chrome/browser/chromeos/login/signin/token_handle_fetcher.h" |
| 53 #include "chrome/browser/chromeos/login/startup_utils.h" | 53 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 54 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" | 54 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h" |
| 55 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 55 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 56 #include "chrome/browser/chromeos/login/user_flow.h" | 56 #include "chrome/browser/chromeos/login/user_flow.h" |
| 57 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 57 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 58 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 58 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
| 59 #include "chrome/browser/chromeos/login/wizard_controller.h" | 59 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 60 #include "chrome/browser/chromeos/net/tether_notification_presenter.h" | |
| 60 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 61 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 61 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 62 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 62 #include "chrome/browser/chromeos/settings/cros_settings.h" | 63 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 63 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 64 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
| 64 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 65 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
| 65 #include "chrome/browser/cryptauth/chrome_cryptauth_service_factory.h" | 66 #include "chrome/browser/cryptauth/chrome_cryptauth_service_factory.h" |
| 66 #include "chrome/browser/first_run/first_run.h" | 67 #include "chrome/browser/first_run/first_run.h" |
| 67 #include "chrome/browser/google/google_brand_chromeos.h" | 68 #include "chrome/browser/google/google_brand_chromeos.h" |
| 68 #include "chrome/browser/lifetime/application_lifetime.h" | 69 #include "chrome/browser/lifetime/application_lifetime.h" |
| 69 #include "chrome/browser/net/crl_set_fetcher.h" | 70 #include "chrome/browser/net/crl_set_fetcher.h" |
| 70 #include "chrome/browser/net/nss_context.h" | 71 #include "chrome/browser/net/nss_context.h" |
| 71 #include "chrome/browser/prefs/session_startup_pref.h" | 72 #include "chrome/browser/prefs/session_startup_pref.h" |
| 72 #include "chrome/browser/profiles/profile.h" | 73 #include "chrome/browser/profiles/profile.h" |
| 73 #include "chrome/browser/profiles/profile_manager.h" | 74 #include "chrome/browser/profiles/profile_manager.h" |
| 74 #include "chrome/browser/signin/account_tracker_service_factory.h" | 75 #include "chrome/browser/signin/account_tracker_service_factory.h" |
| 75 #include "chrome/browser/signin/easy_unlock_service.h" | 76 #include "chrome/browser/signin/easy_unlock_service.h" |
| 77 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | |
| 76 #include "chrome/browser/signin/signin_manager_factory.h" | 78 #include "chrome/browser/signin/signin_manager_factory.h" |
| 77 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" | 79 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" |
| 78 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa ctory.h" | 80 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa ctory.h" |
| 79 #include "chrome/browser/ui/app_list/app_list_service.h" | 81 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 80 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 82 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 81 #include "chrome/common/channel_info.h" | 83 #include "chrome/common/channel_info.h" |
| 82 #include "chrome/common/chrome_switches.h" | 84 #include "chrome/common/chrome_switches.h" |
| 83 #include "chrome/common/logging_chrome.h" | 85 #include "chrome/common/logging_chrome.h" |
| 84 #include "chrome/common/pref_names.h" | 86 #include "chrome/common/pref_names.h" |
| 85 #include "chromeos/cert_loader.h" | 87 #include "chromeos/cert_loader.h" |
| (...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1248 InitRlz(profile); | 1250 InitRlz(profile); |
| 1249 InitializeCerts(profile); | 1251 InitializeCerts(profile); |
| 1250 InitializeCRLSetFetcher(user); | 1252 InitializeCRLSetFetcher(user); |
| 1251 InitializeCertificateTransparencyComponents(user); | 1253 InitializeCertificateTransparencyComponents(user); |
| 1252 | 1254 |
| 1253 arc::ArcServiceLauncher::Get()->OnPrimaryUserProfilePrepared(profile); | 1255 arc::ArcServiceLauncher::Get()->OnPrimaryUserProfilePrepared(profile); |
| 1254 | 1256 |
| 1255 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 1257 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 1256 chromeos::switches::kEnableTether)) { | 1258 chromeos::switches::kEnableTether)) { |
| 1257 chromeos::tether::Initializer::Initialize( | 1259 chromeos::tether::Initializer::Initialize( |
| 1258 ChromeCryptAuthServiceFactory::GetForBrowserContext(profile)); | 1260 ChromeCryptAuthServiceFactory::GetForBrowserContext(profile), |
| 1261 base::MakeUnique<tether::TetherNotificationPresenter>(), | |
|
stevenjb
2017/04/10 20:26:59
See my comment in https://codereview.chromium.org/
Kyle Horimoto
2017/04/11 01:40:40
Done.
| |
| 1262 profile->GetPrefs(), | |
| 1263 ProfileOAuth2TokenServiceFactory::GetForProfile(profile)); | |
| 1259 } | 1264 } |
| 1260 } | 1265 } |
| 1261 | 1266 |
| 1262 UpdateEasyUnlockKeys(user_context_); | 1267 UpdateEasyUnlockKeys(user_context_); |
| 1263 user_context_.ClearSecrets(); | 1268 user_context_.ClearSecrets(); |
| 1264 if (TokenHandlesEnabled()) { | 1269 if (TokenHandlesEnabled()) { |
| 1265 CreateTokenUtilIfMissing(); | 1270 CreateTokenUtilIfMissing(); |
| 1266 if (token_handle_util_->ShouldObtainHandle(user->GetAccountId())) { | 1271 if (token_handle_util_->ShouldObtainHandle(user->GetAccountId())) { |
| 1267 if (!token_handle_fetcher_.get()) { | 1272 if (!token_handle_fetcher_.get()) { |
| 1268 token_handle_fetcher_.reset(new TokenHandleFetcher( | 1273 token_handle_fetcher_.reset(new TokenHandleFetcher( |
| (...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1970 ->browser_policy_connector_chromeos() | 1975 ->browser_policy_connector_chromeos() |
| 1971 ->IsEnterpriseManaged()) { | 1976 ->IsEnterpriseManaged()) { |
| 1972 return false; | 1977 return false; |
| 1973 } | 1978 } |
| 1974 | 1979 |
| 1975 // Do not show end of life notification if this is a guest session | 1980 // Do not show end of life notification if this is a guest session |
| 1976 return !profile->IsGuestSession(); | 1981 return !profile->IsGuestSession(); |
| 1977 } | 1982 } |
| 1978 | 1983 |
| 1979 } // namespace chromeos | 1984 } // namespace chromeos |
| OLD | NEW |