diff options
| author | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 01:46:50 +0000 |
|---|---|---|
| committer | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 01:46:50 +0000 |
| commit | bfc2b4cbaa865df05976d73b989d321277b757aa (patch) | |
| tree | a1f39f532ac30a15954cdfc56b5c980b2c268884 /chrome/browser/content_settings/content_settings_default_provider.h | |
| parent | 063b841e1b7462f9af20d8a5e1613c0effe97a72 (diff) | |
| download | chromium_src-bfc2b4cbaa865df05976d73b989d321277b757aa.zip chromium_src-bfc2b4cbaa865df05976d73b989d321277b757aa.tar.gz chromium_src-bfc2b4cbaa865df05976d73b989d321277b757aa.tar.bz2 | |
Revert 109228 - ContentSettingsObserver (+ related classes) cleanup.
<cmp> This CL needs to be reverted before we revert 109213, which we
speculate caused some performance regressions.
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
TBR=marja@chromium.org
Review URL: http://codereview.chromium.org/8497062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109360 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 f9ddaff..f4a9c34 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, - ContentSetting* settings); + ContentSettings* 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. - ContentSetting default_content_settings_[CONTENT_SETTINGS_NUM_TYPES]; + ContentSettings default_content_settings_; PrefService* prefs_; |