chrome/browser/content_settings/content_settings_pref_provider.h - Issue 8539004: Replace SetContentSetting method of the content_settings::Provider interface with GetWebsiteSetting

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/content_settings_pref_provider.h

Issue 8539004: Replace SetContentSetting method of the content_settings::Provider interface with GetWebsiteSetting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase onto origin/trunk Created 9 years, 1 month 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/content_settings_policy_provider_unittest.cc ('k') | chrome/browser/content_settings/content_settings_pref_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider.h

diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/chrome/browser/content_settings/content_settings_pref_provider.h

index 99c335a8f37380968e3e959b71fa3512447bbf90..2b8b2c25418ab85e73b3b21f3e087bb1a77e543a 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider.h

+++ b/chrome/browser/content_settings/content_settings_pref_provider.h

@@ -44,12 +44,12 @@ class PrefProvider : public ObservableProvider,

const ResourceIdentifier& resource_identifier,

bool incognito) const OVERRIDE;

- virtual void SetContentSetting(

+ virtual bool SetWebsiteSetting(

const ContentSettingsPattern& primary_pattern,

const ContentSettingsPattern& secondary_pattern,

ContentSettingsType content_type,

const ResourceIdentifier& resource_identifier,

- ContentSetting content_setting) OVERRIDE;

+ Value* value) OVERRIDE;

virtual void ClearAllContentSettingsRules(

ContentSettingsType content_type) OVERRIDE;

@@ -77,7 +77,7 @@ class PrefProvider : public ObservableProvider,

const ContentSettingsPattern& secondary_pattern,

ContentSettingsType content_type,

const ResourceIdentifier& resource_identifier,

- ContentSetting setting);

+ const base::Value* value);

// Updates the given |pattern_pairs_settings| dictionary value.

void UpdatePatternPairsSettings(

@@ -85,7 +85,7 @@ class PrefProvider : public ObservableProvider,

const ContentSettingsPattern& secondary_pattern,

ContentSettingsType content_type,

const ResourceIdentifier& resource_identifier,

- ContentSetting setting,

+ const base::Value* value,

DictionaryValue* pattern_pairs_settings);

// Updates the preferences prefs::kContentSettingsPatterns. This preferences