chrome/browser/content_settings/content_settings_default_provider.h - Issue 8538004: Take script URLs into account when applying script content settings.

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_default_provider.h

Issue 8538004: Take script URLs into account when applying script content settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. 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/chrome_content_browser_client.cc ('k') | chrome/browser/content_settings/content_settings_default_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_default_provider.h

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

index f4a9c3410e49a6b9b17ce2c0c2d5ae6260225a8c..f9ddaffd135305d8cb0578de04b18f9d8e66b3e9 100644

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

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

@@ -57,7 +57,7 @@ class DefaultProvider : public ObservableProvider,

private:

// Sets the fields of |settings| based on the values in |dictionary|.

void GetSettingsFromDictionary(const base::DictionaryValue* dictionary,

- ContentSettings* settings);

+ ContentSetting* settings);

// Forces the default settings to be explicitly set instead of themselves

// being CONTENT_SETTING_DEFAULT.

@@ -71,7 +71,7 @@ class DefaultProvider : public ObservableProvider,

void MigrateObsoleteGeolocationPref();

// Copies of the pref data, so that we can read it on the IO thread.

- ContentSettings default_content_settings_;

+ ContentSetting default_content_settings_[CONTENT_SETTINGS_NUM_TYPES];

PrefService* prefs_;