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

Side by Side Diff: base/prefs/pref_service_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
« no previous file with comments | « base/prefs/pref_service_builder.h ('k') | base/prefs/pref_value_store.h » ('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 (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_builder.h" 5 #include "base/prefs/pref_service_builder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/default_pref_store.h" 8 #include "base/prefs/default_pref_store.h"
9 #include "base/prefs/json_pref_store.h" 9 #include "base/prefs/json_pref_store.h"
10 #include "chrome/browser/prefs/pref_notifier_impl.h" 10 #include "base/prefs/pref_notifier_impl.h"
11 #include "chrome/browser/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 12
13 #include "chrome/browser/prefs/pref_value_store.h" 13 #include "base/prefs/pref_value_store.h"
14 14
15 namespace { 15 namespace {
16 16
17 // Do-nothing default implementation. 17 // Do-nothing default implementation.
18 void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) { 18 void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) {
19 } 19 }
20 20
21 } // namespace 21 } // namespace
22 22
23 PrefServiceBuilder::PrefServiceBuilder() { 23 PrefServiceBuilder::PrefServiceBuilder() {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 void PrefServiceBuilder::ResetDefaultState() { 95 void PrefServiceBuilder::ResetDefaultState() {
96 managed_prefs_ = NULL; 96 managed_prefs_ = NULL;
97 extension_prefs_ = NULL; 97 extension_prefs_ = NULL;
98 command_line_prefs_ = NULL; 98 command_line_prefs_ = NULL;
99 user_prefs_ = NULL; 99 user_prefs_ = NULL;
100 recommended_prefs_ = NULL; 100 recommended_prefs_ = NULL;
101 read_error_callback_ = base::Bind(&DoNothingHandleReadError); 101 read_error_callback_ = base::Bind(&DoNothingHandleReadError);
102 async_ = false; 102 async_ = false;
103 } 103 }
OLDNEW
« no previous file with comments | « base/prefs/pref_service_builder.h ('k') | base/prefs/pref_value_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698