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

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

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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.h" 5 #include "chrome/browser/prefs/pref_service_syncable.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/prefs/default_pref_store.h" 9 #include "base/prefs/default_pref_store.h"
10 #include "base/prefs/overlay_user_pref_store.h" 10 #include "base/prefs/overlay_user_pref_store.h"
11 #include "base/prefs/pref_notifier_impl.h" 11 #include "base/prefs/pref_notifier_impl.h"
12 #include "base/prefs/pref_registry.h" 12 #include "base/prefs/pref_registry.h"
13 #include "base/prefs/pref_value_store.h" 13 #include "base/prefs/pref_value_store.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/value_conversions.h" 15 #include "base/value_conversions.h"
16 #include "chrome/browser/prefs/pref_model_associator.h" 16 #include "chrome/browser/prefs/pref_model_associator.h"
17 #include "chrome/browser/prefs/pref_registry_syncable.h"
18 #include "chrome/browser/prefs/pref_service_syncable_observer.h" 17 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
19 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 19 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
20 #include "components/user_prefs/pref_registry_syncable.h"
21 21
22 // static 22 // static
23 PrefServiceSyncable* PrefServiceSyncable::FromProfile(Profile* profile) { 23 PrefServiceSyncable* PrefServiceSyncable::FromProfile(Profile* profile) {
24 return static_cast<PrefServiceSyncable*>(profile->GetPrefs()); 24 return static_cast<PrefServiceSyncable*>(profile->GetPrefs());
25 } 25 }
26 26
27 // static 27 // static
28 PrefServiceSyncable* PrefServiceSyncable::IncognitoFromProfile( 28 PrefServiceSyncable* PrefServiceSyncable::IncognitoFromProfile(
29 Profile* profile) { 29 Profile* profile) {
30 return static_cast<PrefServiceSyncable*>(profile->GetOffTheRecordPrefs()); 30 return static_cast<PrefServiceSyncable*>(profile->GetOffTheRecordPrefs());
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 void PrefServiceSyncable::AddRegisteredSyncablePreference(const char* path) { 130 void PrefServiceSyncable::AddRegisteredSyncablePreference(const char* path) {
131 DCHECK(FindPreference(path)); 131 DCHECK(FindPreference(path));
132 pref_sync_associator_.RegisterPref(path); 132 pref_sync_associator_.RegisterPref(path);
133 } 133 }
134 134
135 void PrefServiceSyncable::OnIsSyncingChanged() { 135 void PrefServiceSyncable::OnIsSyncingChanged() {
136 FOR_EACH_OBSERVER(PrefServiceSyncableObserver, observer_list_, 136 FOR_EACH_OBSERVER(PrefServiceSyncableObserver, observer_list_,
137 OnIsSyncingChanged()); 137 OnIsSyncingChanged());
138 } 138 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698