diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 20:13:25 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 20:13:25 +0000 |
| commit | a495859987b081c6cec74102e5b194d48e124d2e (patch) | |
| tree | bb08a4bb669786257e1caf752c036c34e02edb86 /chrome/browser/extensions | |
| parent | efa2b7217c787f706f2917d25ae5901edd6aab67 (diff) | |
| download | chromium_src-a495859987b081c6cec74102e5b194d48e124d2e.zip chromium_src-a495859987b081c6cec74102e5b194d48e124d2e.tar.gz chromium_src-a495859987b081c6cec74102e5b194d48e124d2e.tar.bz2 | |
Allow resource identifiers in content settings.
Plug-in specific content settings can only be set via the extension API. The --enable-resource-content-settings switch enables them in user preferences.
BUG=78428
TEST=none
Review URL: http://codereview.chromium.org/8202004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_content_settings_api.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_content_settings_apitest.cc | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_content_settings_api.cc b/chrome/browser/extensions/extension_content_settings_api.cc index 01dfee08..82305d3 100644 --- a/chrome/browser/extensions/extension_content_settings_api.cc +++ b/chrome/browser/extensions/extension_content_settings_api.cc @@ -262,9 +262,7 @@ bool GetResourceIdentifiersFunction::RunImpl() { helpers::StringToContentSettingsType(content_type_str); EXTENSION_FUNCTION_VALIDATE(content_type != CONTENT_SETTINGS_TYPE_DEFAULT); - if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS && - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableResourceContentSettings)) { + if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS) { if (g_testing_plugin_groups_) { OnGotPluginGroups(*g_testing_plugin_groups_); } else { diff --git a/chrome/browser/extensions/extension_content_settings_apitest.cc b/chrome/browser/extensions/extension_content_settings_apitest.cc index cae206c..9d7e568 100644 --- a/chrome/browser/extensions/extension_content_settings_apitest.cc +++ b/chrome/browser/extensions/extension_content_settings_apitest.cc @@ -93,8 +93,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_ContentSettingsGetResourceIdentifiers) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableResourceContentSettings); FilePath::CharType kFooPath[] = FILE_PATH_LITERAL("/plugins/foo.plugin"); FilePath::CharType kBarPath[] = FILE_PATH_LITERAL("/plugins/bar.plugin"); |