diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-09-14 11:12:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-14 18:12:47 +0000 |
| commit | 0b1722f004e4424b18585a29234408b7112815cf (patch) | |
| tree | 89a425ecdb7cc66d3c6cfd782d3d93b8245ceaaf /chrome/browser/ui/prefs | |
| parent | d12a62df87f73b6ee73c0a0169c9f2716dd4ee17 (diff) | |
| download | chromium_src-0b1722f004e4424b18585a29234408b7112815cf.zip chromium_src-0b1722f004e4424b18585a29234408b7112815cf.tar.gz chromium_src-0b1722f004e4424b18585a29234408b7112815cf.tar.bz2 | |
Remove dependency of PrefSyncableService on PrefsTabHelper.
In preparation of the componentization of PrefSyncableService (with the
goal of sharing the code on iOS), remove the dependency on PrefsTabHelper
by passing a list of preferences to register as overlaid.
Add a helper method in chrome/browser/prefspref_service_syncable_util.cc
to pass the list of preferences previously registered in PrefsTabHelper.
Remove the method PrefsTabHelper::InitIncognitoUserPrefStore().
BUG=522536
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1332283003
Cr-Commit-Position: refs/heads/master@{#348656}
Diffstat (limited to 'chrome/browser/ui/prefs')
| -rw-r--r-- | chrome/browser/ui/prefs/prefs_tab_helper.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/ui/prefs/prefs_tab_helper.h | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 1cf523f..5cb2d6e 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -491,19 +491,6 @@ PrefsTabHelper::~PrefsTabHelper() { } // static -void PrefsTabHelper::InitIncognitoUserPrefStore( - OverlayUserPrefStore* pref_store) { - // List of keys that cannot be changed in the user prefs file by the incognito - // profile. All preferences that store information about the browsing history - // or behavior of the user should have this property. - pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement); - pref_store->RegisterOverlayPref(prefs::kSaveFileDefaultDirectory); -#if defined(OS_ANDROID) || defined(OS_IOS) - pref_store->RegisterOverlayPref(proxy_config::prefs::kProxy); -#endif // defined(OS_ANDROID) || defined(OS_IOS) -} - -// static void PrefsTabHelper::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { WebPreferences pref_defaults; diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h index 8ce832a..07e64cd 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.h +++ b/chrome/browser/ui/prefs/prefs_tab_helper.h @@ -31,7 +31,6 @@ class PrefsTabHelper : public content::NotificationObserver, public: ~PrefsTabHelper() override; - static void InitIncognitoUserPrefStore(OverlayUserPrefStore* pref_store); static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); static void GetServiceInstance(); |