diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 03:37:58 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 03:37:58 +0000 |
| commit | 7148ac37ac524a2c96023445d615f37c84f9de63 (patch) | |
| tree | 1238cb5792abdf0a09f4bbc35ed543b9990e886e /chrome/browser/content_settings/content_settings_default_provider.h | |
| parent | 24d41a788f4f7427127dea4f94da8c0ce47209ae (diff) | |
| download | chromium_src-7148ac37ac524a2c96023445d615f37c84f9de63.zip chromium_src-7148ac37ac524a2c96023445d615f37c84f9de63.tar.gz chromium_src-7148ac37ac524a2c96023445d615f37c84f9de63.tar.bz2 | |
Fixed interaction of JavascriptEnabled and DefaultJavascriptSetting policies.
Also shows the "managed-by-admin" banner when JavascriptEnabled is forced to
false.
The pyauto test for JavascriptEnabled has been enabled again.
Did some cleanups on content_settings/ while fixing this.
BUG=97754,97749
TEST=policy_prefs_ui.py passes
Review URL: http://codereview.chromium.org/8236001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104995 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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/content_settings/content_settings_default_provider.h b/chrome/browser/content_settings/content_settings_default_provider.h index 2850ce0..364bfb11 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.h +++ b/chrome/browser/content_settings/content_settings_default_provider.h @@ -15,6 +15,8 @@ #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +class PrefService; + namespace content_settings { // Provider that provides default content settings based on |