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

Side by Side Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

Issue 1108983002: Fetch policy with refresh token. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix user_cloud_policy_manager_chromeos_unittest Created 5 years, 7 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/policy/user_cloud_policy_manager_factory_chrom eos.h" 5 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/message_loop/message_loop_proxy.h" 12 #include "base/message_loop/message_loop_proxy.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/sequenced_task_runner.h" 14 #include "base/sequenced_task_runner.h"
15 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
19 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 18 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
20 #include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h" 19 #include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h"
21 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 20 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
22 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" 21 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
23 #include "chrome/browser/chromeos/profiles/profile_helper.h" 22 #include "chrome/browser/chromeos/profiles/profile_helper.h"
24 #include "chrome/browser/chromeos/settings/cros_settings.h" 23 #include "chrome/browser/chromeos/settings/cros_settings.h"
25 #include "chrome/browser/policy/schema_registry_service.h" 24 #include "chrome/browser/policy/schema_registry_service.h"
26 #include "chrome/browser/policy/schema_registry_service_factory.h" 25 #include "chrome/browser/policy/schema_registry_service_factory.h"
27 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
28 #include "chromeos/chromeos_paths.h" 27 #include "chromeos/chromeos_paths.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 BrowserPolicyConnector::IsNonEnterpriseUser(username)) { 141 BrowserPolicyConnector::IsNonEnterpriseUser(username)) {
143 return scoped_ptr<UserCloudPolicyManagerChromeOS>(); 142 return scoped_ptr<UserCloudPolicyManagerChromeOS>();
144 } 143 }
145 144
146 policy::BrowserPolicyConnectorChromeOS* connector = 145 policy::BrowserPolicyConnectorChromeOS* connector =
147 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 146 g_browser_process->platform_part()->browser_policy_connector_chromeos();
148 UserAffiliation affiliation = connector->GetUserAffiliation(username); 147 UserAffiliation affiliation = connector->GetUserAffiliation(username);
149 const bool is_affiliated_user = affiliation == USER_AFFILIATION_MANAGED; 148 const bool is_affiliated_user = affiliation == USER_AFFILIATION_MANAGED;
150 const bool is_browser_restart = 149 const bool is_browser_restart =
151 command_line->HasSwitch(chromeos::switches::kLoginUser); 150 command_line->HasSwitch(chromeos::switches::kLoginUser);
152 // TODO(xiyuan): Update the code below after http://crbug.com/462036.
153 const bool wait_for_initial_policy = 151 const bool wait_for_initial_policy =
154 !is_browser_restart && 152 !is_browser_restart &&
155 chromeos::UserSessionManager::GetInstance()->has_auth_cookies() &&
156 (user_manager::UserManager::Get()->IsCurrentUserNew() || 153 (user_manager::UserManager::Get()->IsCurrentUserNew() ||
157 is_affiliated_user); 154 is_affiliated_user);
158 155
159 const base::TimeDelta initial_policy_fetch_timeout = 156 const base::TimeDelta initial_policy_fetch_timeout =
160 user_manager::UserManager::Get()->IsCurrentUserNew() 157 user_manager::UserManager::Get()->IsCurrentUserNew()
161 ? base::TimeDelta::Max() 158 ? base::TimeDelta::Max()
162 : base::TimeDelta::FromSeconds(kInitialPolicyFetchTimeoutSeconds); 159 : base::TimeDelta::FromSeconds(kInitialPolicyFetchTimeoutSeconds);
163 160
164 DeviceManagementService* device_management_service = 161 DeviceManagementService* device_management_service =
165 connector->device_management_service(); 162 connector->device_management_service();
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 external_data_dir, 194 external_data_dir,
198 store.get())); 195 store.get()));
199 if (force_immediate_load) 196 if (force_immediate_load)
200 store->LoadImmediately(); 197 store->LoadImmediately();
201 198
202 scoped_refptr<base::SequencedTaskRunner> file_task_runner = 199 scoped_refptr<base::SequencedTaskRunner> file_task_runner =
203 content::BrowserThread::GetMessageLoopProxyForThread( 200 content::BrowserThread::GetMessageLoopProxyForThread(
204 content::BrowserThread::FILE); 201 content::BrowserThread::FILE);
205 202
206 scoped_ptr<UserCloudPolicyManagerChromeOS> manager( 203 scoped_ptr<UserCloudPolicyManagerChromeOS> manager(
207 new UserCloudPolicyManagerChromeOS(store.Pass(), 204 new UserCloudPolicyManagerChromeOS(
208 external_data_manager.Pass(), 205 store.Pass(), external_data_manager.Pass(),
209 component_policy_cache_dir, 206 component_policy_cache_dir, wait_for_initial_policy,
210 wait_for_initial_policy, 207 initial_policy_fetch_timeout, base::MessageLoopProxy::current(),
211 initial_policy_fetch_timeout, 208 file_task_runner, io_task_runner));
212 base::MessageLoopProxy::current(),
213 file_task_runner,
214 io_task_runner));
215 209
216 bool wildcard_match = false; 210 bool wildcard_match = false;
217 if (connector->IsEnterpriseManaged() && 211 if (connector->IsEnterpriseManaged() &&
218 chromeos::CrosSettings::IsWhitelisted(username, &wildcard_match) && 212 chromeos::CrosSettings::IsWhitelisted(username, &wildcard_match) &&
219 wildcard_match && !connector->IsNonEnterpriseUser(username)) { 213 wildcard_match && !connector->IsNonEnterpriseUser(username)) {
220 manager->EnableWildcardLoginCheck(username); 214 manager->EnableWildcardLoginCheck(username);
221 } 215 }
222 216
223 manager->Init( 217 manager->Init(
224 SchemaRegistryServiceFactory::GetForContext(profile)->registry()); 218 SchemaRegistryServiceFactory::GetForContext(profile)->registry());
(...skipping 29 matching lines...) Expand all
254 248
255 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory( 249 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory(
256 content::BrowserContext* context) { 250 content::BrowserContext* context) {
257 return false; 251 return false;
258 } 252 }
259 253
260 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow( 254 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
261 content::BrowserContext* context) {} 255 content::BrowserContext* context) {}
262 256
263 } // namespace policy 257 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698