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 1477733002: Add ArcNotificationManager for new ARC notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync dependencies Created 4 years, 11 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 | « no previous file | components/arc.gypi » ('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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "chrome/browser/net/nss_context.h" 69 #include "chrome/browser/net/nss_context.h"
70 #include "chrome/browser/prefs/session_startup_pref.h" 70 #include "chrome/browser/prefs/session_startup_pref.h"
71 #include "chrome/browser/profiles/profile.h" 71 #include "chrome/browser/profiles/profile.h"
72 #include "chrome/browser/profiles/profile_manager.h" 72 #include "chrome/browser/profiles/profile_manager.h"
73 #include "chrome/browser/signin/account_tracker_service_factory.h" 73 #include "chrome/browser/signin/account_tracker_service_factory.h"
74 #include "chrome/browser/signin/easy_unlock_service.h" 74 #include "chrome/browser/signin/easy_unlock_service.h"
75 #include "chrome/browser/signin/signin_manager_factory.h" 75 #include "chrome/browser/signin/signin_manager_factory.h"
76 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" 76 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
77 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa ctory.h" 77 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa ctory.h"
78 #include "chrome/browser/ui/app_list/start_page_service.h" 78 #include "chrome/browser/ui/app_list/start_page_service.h"
79 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
79 #include "chrome/browser/ui/startup/startup_browser_creator.h" 80 #include "chrome/browser/ui/startup/startup_browser_creator.h"
80 #include "chrome/common/chrome_switches.h" 81 #include "chrome/common/chrome_switches.h"
81 #include "chrome/common/logging_chrome.h" 82 #include "chrome/common/logging_chrome.h"
82 #include "chrome/common/pref_names.h" 83 #include "chrome/common/pref_names.h"
83 #include "chromeos/cert_loader.h" 84 #include "chromeos/cert_loader.h"
84 #include "chromeos/chromeos_switches.h" 85 #include "chromeos/chromeos_switches.h"
85 #include "chromeos/cryptohome/cryptohome_util.h" 86 #include "chromeos/cryptohome/cryptohome_util.h"
86 #include "chromeos/dbus/cryptohome_client.h" 87 #include "chromeos/dbus/cryptohome_client.h"
87 #include "chromeos/dbus/dbus_thread_manager.h" 88 #include "chromeos/dbus/dbus_thread_manager.h"
88 #include "chromeos/dbus/session_manager_client.h" 89 #include "chromeos/dbus/session_manager_client.h"
89 #include "chromeos/login/auth/stub_authenticator.h" 90 #include "chromeos/login/auth/stub_authenticator.h"
90 #include "chromeos/login/user_names.h" 91 #include "chromeos/login/user_names.h"
91 #include "chromeos/network/portal_detector/network_portal_detector.h" 92 #include "chromeos/network/portal_detector/network_portal_detector.h"
92 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" 93 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
93 #include "chromeos/settings/cros_settings_names.h" 94 #include "chromeos/settings/cros_settings_names.h"
95 #include "components/arc/arc_bridge_service.h"
96 #include "components/arc/arc_service_manager.h"
94 #include "components/component_updater/component_updater_service.h" 97 #include "components/component_updater/component_updater_service.h"
95 #include "components/flags_ui/pref_service_flags_storage.h" 98 #include "components/flags_ui/pref_service_flags_storage.h"
96 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 99 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
97 #include "components/session_manager/core/session_manager.h" 100 #include "components/session_manager/core/session_manager.h"
98 #include "components/signin/core/account_id/account_id.h" 101 #include "components/signin/core/account_id/account_id.h"
99 #include "components/signin/core/browser/account_tracker_service.h" 102 #include "components/signin/core/browser/account_tracker_service.h"
100 #include "components/signin/core/browser/signin_manager_base.h" 103 #include "components/signin/core/browser/signin_manager_base.h"
101 #include "components/user_manager/known_user.h" 104 #include "components/user_manager/known_user.h"
102 #include "components/user_manager/user.h" 105 #include "components/user_manager/user.h"
103 #include "components/user_manager/user_manager.h" 106 #include "components/user_manager/user_manager.h"
(...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 content::Details<Profile>(profile)); 1120 content::Details<Profile>(profile));
1118 1121
1119 // Initialize various services only for primary user. 1122 // Initialize various services only for primary user.
1120 const user_manager::User* user = 1123 const user_manager::User* user =
1121 ProfileHelper::Get()->GetUserByProfile(profile); 1124 ProfileHelper::Get()->GetUserByProfile(profile);
1122 if (user_manager->GetPrimaryUser() == user) { 1125 if (user_manager->GetPrimaryUser() == user) {
1123 InitRlz(profile); 1126 InitRlz(profile);
1124 InitializeCerts(profile); 1127 InitializeCerts(profile);
1125 InitializeCRLSetFetcher(user); 1128 InitializeCRLSetFetcher(user);
1126 InitializeEVCertificatesWhitelistComponent(user); 1129 InitializeEVCertificatesWhitelistComponent(user);
1130
1131 if (arc::ArcBridgeService::GetEnabled(
1132 base::CommandLine::ForCurrentProcess())) {
1133 DCHECK(arc::ArcServiceManager::Get());
1134 arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(
1135 multi_user_util::GetAccountIdFromProfile(profile));
1136 }
1127 } 1137 }
1128 1138
1129 UpdateEasyUnlockKeys(user_context_); 1139 UpdateEasyUnlockKeys(user_context_);
1130 user_context_.ClearSecrets(); 1140 user_context_.ClearSecrets();
1131 if (TokenHandlesEnabled()) { 1141 if (TokenHandlesEnabled()) {
1132 CreateTokenUtilIfMissing(); 1142 CreateTokenUtilIfMissing();
1133 if (token_handle_util_->ShouldObtainHandle(user->GetAccountId())) { 1143 if (token_handle_util_->ShouldObtainHandle(user->GetAccountId())) {
1134 if (!token_handle_fetcher_.get()) { 1144 if (!token_handle_fetcher_.get()) {
1135 token_handle_fetcher_.reset(new TokenHandleFetcher( 1145 token_handle_fetcher_.reset(new TokenHandleFetcher(
1136 token_handle_util_.get(), user->GetAccountId())); 1146 token_handle_util_.get(), user->GetAccountId()));
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
1767 token_handle_util_.reset(); 1777 token_handle_util_.reset();
1768 first_run::GoodiesDisplayer::Delete(); 1778 first_run::GoodiesDisplayer::Delete();
1769 } 1779 }
1770 1780
1771 void UserSessionManager::CreateTokenUtilIfMissing() { 1781 void UserSessionManager::CreateTokenUtilIfMissing() {
1772 if (!token_handle_util_.get()) 1782 if (!token_handle_util_.get())
1773 token_handle_util_.reset(new TokenHandleUtil()); 1783 token_handle_util_.reset(new TokenHandleUtil());
1774 } 1784 }
1775 1785
1776 } // namespace chromeos 1786 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | components/arc.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698