diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 20:13:04 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 20:13:04 +0000 |
| commit | aeb3ceffa4d252755e968a0e4e1a4f122764defc (patch) | |
| tree | 722442b73da4a131cd1578fb479a8684a07defb8 | |
| parent | 161d86c767bf08f2606e7715734131eab214536a (diff) | |
| download | chromium_src-aeb3ceffa4d252755e968a0e4e1a4f122764defc.zip chromium_src-aeb3ceffa4d252755e968a0e4e1a4f122764defc.tar.gz chromium_src-aeb3ceffa4d252755e968a0e4e1a4f122764defc.tar.bz2 | |
Indicate that javascript has been blocked when blocking NaCl.
BUG=91571
TEST=none
Review URL: http://codereview.chromium.org/8038022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102786 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 1e97675..91841cf 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -327,6 +327,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( scoped_ptr<webkit::npapi::PluginGroup> group( webkit::npapi::PluginList::Singleton()->GetPluginGroup(info)); + ContentSettingsType content_type = CONTENT_SETTINGS_TYPE_PLUGINS; ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT; std::string resource; if (cmd->HasSwitch(switches::kEnableResourceContentSettings)) @@ -391,8 +392,9 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( bool is_nacl_plugin = info.name == ASCIIToUTF16(ChromeContentClient::kNaClPluginName); if (is_nacl_plugin) { + content_type = CONTENT_SETTINGS_TYPE_JAVASCRIPT; plugin_setting = - observer->GetContentSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT); + observer->GetContentSetting(content_type); } if (plugin_setting == CONTENT_SETTING_ALLOW || @@ -471,7 +473,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( frame, params, info.path, actual_mime_type); } - observer->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource); + observer->DidBlockContentType(content_type, resource); if (plugin_setting == CONTENT_SETTING_ASK) { RenderThread::RecordUserMetrics("Plugin_ClickToPlay"); return CreatePluginPlaceholder( |