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

Side by Side Diff: components/prefs/pref_service_factory.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « components/prefs/pref_service_factory.h ('k') | components/prefs/pref_service_unittest.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "components/prefs/pref_service_factory.h" 5 #include "components/prefs/pref_service_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/sequenced_task_runner.h" 8 #include "base/sequenced_task_runner.h"
9 #include "components/prefs/default_pref_store.h" 9 #include "components/prefs/default_pref_store.h"
10 #include "components/prefs/json_pref_store.h" 10 #include "components/prefs/json_pref_store.h"
11 #include "components/prefs/pref_filter.h" 11 #include "components/prefs/pref_filter.h"
12 #include "components/prefs/pref_notifier_impl.h" 12 #include "components/prefs/pref_notifier_impl.h"
13 #include "components/prefs/pref_service.h" 13 #include "components/prefs/pref_service.h"
14 #include "components/prefs/pref_value_store.h" 14 #include "components/prefs/pref_value_store.h"
15 15
16 namespace base {
17
16 namespace { 18 namespace {
17 19
18 // Do-nothing default implementation. 20 // Do-nothing default implementation.
19 void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) { 21 void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) {
20 } 22 }
21 23
22 } // namespace 24 } // namespace
23 25
24 PrefServiceFactory::PrefServiceFactory() 26 PrefServiceFactory::PrefServiceFactory()
25 : managed_prefs_(NULL), 27 : managed_prefs_(NULL),
(...skipping 26 matching lines...) Expand all
52 user_prefs_.get(), 54 user_prefs_.get(),
53 recommended_prefs_.get(), 55 recommended_prefs_.get(),
54 pref_registry->defaults().get(), 56 pref_registry->defaults().get(),
55 pref_notifier), 57 pref_notifier),
56 user_prefs_.get(), 58 user_prefs_.get(),
57 pref_registry, 59 pref_registry,
58 read_error_callback_, 60 read_error_callback_,
59 async_)); 61 async_));
60 return pref_service; 62 return pref_service;
61 } 63 }
64
65 } // namespace base
OLDNEW
« no previous file with comments | « components/prefs/pref_service_factory.h ('k') | components/prefs/pref_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698