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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log
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/pref_service_syncable_builder.h" 5 #include "chrome/browser/prefs/pref_service_syncable_builder.h"
6 6
7 #include "base/prefs/default_pref_store.h" 7 #include "base/prefs/default_pref_store.h"
8 #include "base/prefs/pref_notifier_impl.h"
9 #include "base/prefs/pref_value_store.h"
8 #include "chrome/browser/policy/configuration_policy_pref_store.h" 10 #include "chrome/browser/policy/configuration_policy_pref_store.h"
9 #include "chrome/browser/policy/policy_service.h" 11 #include "chrome/browser/policy/policy_service.h"
10 #include "chrome/browser/prefs/command_line_pref_store.h" 12 #include "chrome/browser/prefs/command_line_pref_store.h"
11 #include "chrome/browser/prefs/pref_notifier_impl.h"
12 #include "chrome/browser/prefs/pref_registry_syncable.h" 13 #include "chrome/browser/prefs/pref_registry_syncable.h"
13 #include "chrome/browser/prefs/pref_service_syncable.h" 14 #include "chrome/browser/prefs/pref_service_syncable.h"
14 #include "chrome/browser/prefs/pref_value_store.h"
15 15
16 PrefServiceSyncableBuilder::PrefServiceSyncableBuilder() { 16 PrefServiceSyncableBuilder::PrefServiceSyncableBuilder() {
17 } 17 }
18 18
19 PrefServiceSyncableBuilder::~PrefServiceSyncableBuilder() { 19 PrefServiceSyncableBuilder::~PrefServiceSyncableBuilder() {
20 } 20 }
21 21
22 #if defined(ENABLE_CONFIGURATION_POLICY) 22 #if defined(ENABLE_CONFIGURATION_POLICY)
23 PrefServiceSyncableBuilder& PrefServiceSyncableBuilder::WithManagedPolicies( 23 PrefServiceSyncableBuilder& PrefServiceSyncableBuilder::WithManagedPolicies(
24 policy::PolicyService* service) { 24 policy::PolicyService* service) {
(...skipping 29 matching lines...) Expand all
54 recommended_prefs_.get(), 54 recommended_prefs_.get(),
55 pref_registry->defaults(), 55 pref_registry->defaults(),
56 pref_notifier), 56 pref_notifier),
57 user_prefs_.get(), 57 user_prefs_.get(),
58 pref_registry, 58 pref_registry,
59 read_error_callback_, 59 read_error_callback_,
60 async_); 60 async_);
61 ResetDefaultState(); 61 ResetDefaultState();
62 return pref_service; 62 return pref_service;
63 } 63 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_service_syncable_builder.h ('k') | chrome/browser/prefs/pref_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698