| Index: chrome/browser/chrome_plugin_service_filter.cc
|
| diff --git a/chrome/browser/chrome_plugin_service_filter.cc b/chrome/browser/chrome_plugin_service_filter.cc
|
| index e22649503bd538c85f1b5fba7da22d97ce6eb0a3..a360c334c6553d1773a033c9b6426582eea3bb95 100644
|
| --- a/chrome/browser/chrome_plugin_service_filter.cc
|
| +++ b/chrome/browser/chrome_plugin_service_filter.cc
|
| @@ -70,20 +70,6 @@ void ChromePluginServiceFilter::UnrestrictPlugin(
|
| restricted_plugins_.erase(plugin_path);
|
| }
|
|
|
| -void ChromePluginServiceFilter::DisableNPAPIForRenderView(
|
| - int render_process_id,
|
| - int render_view_id) {
|
| - RenderViewInfo render_view(render_process_id, render_view_id);
|
| - npapi_disabled_render_views_.insert(render_view);
|
| -}
|
| -
|
| -void ChromePluginServiceFilter::ClearDisabledNPAPIForRenderView(
|
| - int render_process_id,
|
| - int render_view_id) {
|
| - RenderViewInfo render_view(render_process_id, render_view_id);
|
| - npapi_disabled_render_views_.erase(render_view);
|
| -}
|
| -
|
| bool ChromePluginServiceFilter::ShouldUsePlugin(
|
| int render_process_id,
|
| int render_view_id,
|
| @@ -135,15 +121,6 @@ bool ChromePluginServiceFilter::ShouldUsePlugin(
|
| }
|
| }
|
|
|
| - if (plugin->type == webkit::WebPluginInfo::PLUGIN_TYPE_NPAPI) {
|
| - // Check if the NPAPI plugin has been disabled for this render view.
|
| - RenderViewInfo render_view(render_process_id, render_view_id);
|
| - if (npapi_disabled_render_views_.find(render_view) !=
|
| - npapi_disabled_render_views_.end()) {
|
| - return false;
|
| - }
|
| - }
|
| -
|
| return true;
|
| }
|
|
|
|
|