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

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/prefs/chrome_pref_service_factory.h" 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 #if defined(ENABLE_SUPERVISED_USERS) 390 #if defined(ENABLE_SUPERVISED_USERS)
391 if (supervised_user_settings) { 391 if (supervised_user_settings) {
392 factory->set_supervised_user_prefs( 392 factory->set_supervised_user_prefs(
393 make_scoped_refptr( 393 make_scoped_refptr(
394 new SupervisedUserPrefStore(supervised_user_settings))); 394 new SupervisedUserPrefStore(supervised_user_settings)));
395 } 395 }
396 #endif 396 #endif
397 397
398 factory->set_async(async); 398 factory->set_async(async);
399 factory->set_extension_prefs(extension_prefs); 399 factory->set_extension_prefs(extension_prefs);
400 factory->set_command_line_prefs( 400 factory->set_command_line_prefs(make_scoped_refptr(
401 make_scoped_refptr( 401 new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())));
402 new CommandLinePrefStore(CommandLine::ForCurrentProcess())));
403 factory->set_read_error_callback(base::Bind(&HandleReadError)); 402 factory->set_read_error_callback(base::Bind(&HandleReadError));
404 factory->set_user_prefs(user_pref_store); 403 factory->set_user_prefs(user_pref_store);
405 } 404 }
406 405
407 } // namespace 406 } // namespace
408 407
409 namespace chrome_prefs { 408 namespace chrome_prefs {
410 409
411 namespace internals { 410 namespace internals {
412 411
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 510
512 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 511 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
513 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 512 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
514 } 513 }
515 514
516 void RegisterPrefs(PrefRegistrySimple* registry) { 515 void RegisterPrefs(PrefRegistrySimple* registry) {
517 ProfilePrefStoreManager::RegisterPrefs(registry); 516 ProfilePrefStoreManager::RegisterPrefs(registry);
518 } 517 }
519 518
520 } // namespace chrome_prefs 519 } // namespace chrome_prefs
OLDNEW
« no previous file with comments | « chrome/browser/prefetch/prefetch_browsertest.cc ('k') | chrome/browser/prefs/chrome_pref_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698