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

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

Issue 640353003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 6 years, 2 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"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 external_data_dir, 194 external_data_dir,
195 store.get())); 195 store.get()));
196 if (force_immediate_load) 196 if (force_immediate_load)
197 store->LoadImmediately(); 197 store->LoadImmediately();
198 198
199 scoped_refptr<base::SequencedTaskRunner> file_task_runner = 199 scoped_refptr<base::SequencedTaskRunner> file_task_runner =
200 content::BrowserThread::GetMessageLoopProxyForThread( 200 content::BrowserThread::GetMessageLoopProxyForThread(
201 content::BrowserThread::FILE); 201 content::BrowserThread::FILE);
202 202
203 scoped_ptr<UserCloudPolicyManagerChromeOS> manager( 203 scoped_ptr<UserCloudPolicyManagerChromeOS> manager(
204 new UserCloudPolicyManagerChromeOS( 204 new UserCloudPolicyManagerChromeOS(store.Pass(),
205 store.PassAs<CloudPolicyStore>(), 205 external_data_manager.Pass(),
206 external_data_manager.Pass(), 206 component_policy_cache_dir,
207 component_policy_cache_dir, 207 wait_for_initial_policy,
208 wait_for_initial_policy, 208 initial_policy_fetch_timeout,
209 initial_policy_fetch_timeout, 209 base::MessageLoopProxy::current(),
210 base::MessageLoopProxy::current(), 210 file_task_runner,
211 file_task_runner, 211 io_task_runner));
212 io_task_runner));
213 212
214 bool wildcard_match = false; 213 bool wildcard_match = false;
215 if (connector->IsEnterpriseManaged() && 214 if (connector->IsEnterpriseManaged() &&
216 chromeos::LoginUtils::IsWhitelisted(username, &wildcard_match) && 215 chromeos::LoginUtils::IsWhitelisted(username, &wildcard_match) &&
217 wildcard_match && 216 wildcard_match &&
218 !connector->IsNonEnterpriseUser(username)) { 217 !connector->IsNonEnterpriseUser(username)) {
219 manager->EnableWildcardLoginCheck(username); 218 manager->EnableWildcardLoginCheck(username);
220 } 219 }
221 220
222 manager->Init( 221 manager->Init(
(...skipping 30 matching lines...) Expand all
253 252
254 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory( 253 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory(
255 content::BrowserContext* context) { 254 content::BrowserContext* context) {
256 return false; 255 return false;
257 } 256 }
258 257
259 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow( 258 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
260 content::BrowserContext* context) {} 259 content::BrowserContext* context) {}
261 260
262 } // namespace policy 261 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698