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

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

Issue 1332283003: Remove dependency of PrefSyncableService on PrefsTabHelper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_service_syncable_util
Patch Set: Pass a list of preferences instead of a callback Created 5 years, 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_util.h" 5 #include "chrome/browser/prefs/pref_service_syncable_util.h"
6 6
7 #include <vector>
8
9 #include "base/logging.h"
10 #include "build/build_config.h"
7 #include "chrome/browser/prefs/pref_service_syncable.h" 11 #include "chrome/browser/prefs/pref_service_syncable.h"
8 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/common/pref_names.h"
14
15 #if defined(OS_ANDROID) || defined(OS_IOS)
16 #include "components/proxy_config/proxy_config_pref_names.h"
17 #endif
9 18
10 PrefServiceSyncable* PrefServiceSyncableFromProfile(Profile* profile) { 19 PrefServiceSyncable* PrefServiceSyncableFromProfile(Profile* profile) {
11 return static_cast<PrefServiceSyncable*>(profile->GetPrefs()); 20 return static_cast<PrefServiceSyncable*>(profile->GetPrefs());
12 } 21 }
13 22
14 PrefServiceSyncable* PrefServiceSyncableIncognitoFromProfile(Profile* profile) { 23 PrefServiceSyncable* PrefServiceSyncableIncognitoFromProfile(Profile* profile) {
15 return static_cast<PrefServiceSyncable*>(profile->GetOffTheRecordPrefs()); 24 return static_cast<PrefServiceSyncable*>(profile->GetOffTheRecordPrefs());
16 } 25 }
26
27 PrefServiceSyncable* CreateIncognitoPrefServiceSyncable(
28 PrefServiceSyncable* pref_service,
29 PrefStore* incognito_extension_prefs) {
30 // List of keys that cannot be changed in the user prefs file by the incognito
31 // profile. All preferences that store information about the browsing history
32 // or behavior of the user should have this property.
33 std::vector<const char*> overlay_pref_names;
34 overlay_pref_names.push_back(prefs::kBrowserWindowPlacement);
35 overlay_pref_names.push_back(prefs::kSaveFileDefaultDirectory);
36 #if defined(OS_ANDROID) || defined(OS_IOS)
37 overlay_pref_names.push_back(proxy_config::prefs::kProxy);
38 #endif
39 return pref_service->CreateIncognitoPrefService(incognito_extension_prefs,
40 overlay_pref_names);
41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698