chrome/browser/content_settings/host_content_settings_map.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.h ('k') | chrome/browser/custom_handlers/protocol_handler_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map.cc

diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc

index 4503e06a31562857f5b7f0382fc1e5e321a44f26..f4ed3245bec852d4d6f070e199d46df159ff46ae 100644

--- a/chrome/browser/content_settings/host_content_settings_map.cc

+++ b/chrome/browser/content_settings/host_content_settings_map.cc

@@ -23,6 +23,7 @@

#include "chrome/browser/content_settings/content_settings_utils.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/intents/web_intents_util.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

@@ -130,19 +131,21 @@ void HostContentSettingsMap::RegisterExtensionService(

#endif

// static

-void HostContentSettingsMap::RegisterUserPrefs(PrefServiceSyncable* prefs) {

- prefs->RegisterIntegerPref(prefs::kContentSettingsWindowLastTabIndex,

- 0,

- PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs->RegisterIntegerPref(prefs::kContentSettingsDefaultWhitelistVersion,

- 0, PrefServiceSyncable::SYNCABLE_PREF);

- prefs->RegisterBooleanPref(prefs::kContentSettingsClearOnExitMigrated,

- false, PrefServiceSyncable::SYNCABLE_PREF);

+void HostContentSettingsMap::RegisterUserPrefs(PrefRegistrySyncable* registry) {

+ registry->RegisterIntegerPref(prefs::kContentSettingsWindowLastTabIndex,

+ 0,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterIntegerPref(prefs::kContentSettingsDefaultWhitelistVersion,

+ 0,

+ PrefRegistrySyncable::SYNCABLE_PREF);

+ registry->RegisterBooleanPref(prefs::kContentSettingsClearOnExitMigrated,

+ false,

+ PrefRegistrySyncable::SYNCABLE_PREF);

// Register the prefs for the content settings providers.

- content_settings::DefaultProvider::RegisterUserPrefs(prefs);

- content_settings::PrefProvider::RegisterUserPrefs(prefs);

- content_settings::PolicyProvider::RegisterUserPrefs(prefs);

+ content_settings::DefaultProvider::RegisterUserPrefs(registry);

+ content_settings::PrefProvider::RegisterUserPrefs(registry);

+ content_settings::PolicyProvider::RegisterUserPrefs(registry);

}

ContentSetting HostContentSettingsMap::GetDefaultContentSettingFromProvider(