diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 12:55:14 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 12:55:14 +0000 |
| commit | 6158e4fffc80c2e6aaef1fa7b8fc28c2b9e96d1e (patch) | |
| tree | 43e0a1679453770f7bf78724332a118494b00560 /chrome/browser/content_settings/content_settings_default_provider.h | |
| parent | 65df010baf6b520699cd44e4396c72d0d5e56538 (diff) | |
| download | chromium_src-6158e4fffc80c2e6aaef1fa7b8fc28c2b9e96d1e.zip chromium_src-6158e4fffc80c2e6aaef1fa7b8fc28c2b9e96d1e.tar.gz chromium_src-6158e4fffc80c2e6aaef1fa7b8fc28c2b9e96d1e.tar.bz2 | |
ContentSettingsObserver (+ related classes) cleanup.
Per-page content settings and default content settings are no longer needed,
since the renderer stores the content setting rules for images and scripts.
BUG=102662
TEST=NONE
Review URL: http://codereview.chromium.org/8498007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/content_settings_default_provider.h')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_default_provider.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/content_settings/content_settings_default_provider.h b/chrome/browser/content_settings/content_settings_default_provider.h index f4a9c34..f9ddaff 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_; |