From 8b75315a99bb43615b5efbf56734811bf06cd86b Mon Sep 17 00:00:00 2001 From: "dbeam@chromium.org" Date: Fri, 1 Feb 2013 07:49:30 +0000 Subject: Broke ContentSettingBubbleModelTest.Plugins on Android. Revert 180103 - Only permit plug-in loads in the browser if the plug-in isn't blocked or the user has authorized it with a browser-mediated interaction. BUG=172573 Review URL: https://codereview.chromium.org/12086077 TBR=cevans@chromium.org Review URL: https://chromiumcodereview.appspot.com/12114045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180110 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/plugin_service_impl.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'content/browser/plugin_service_impl.h') diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index 5ad03ed..8808c4b 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -120,14 +120,13 @@ class CONTENT_EXPORT PluginServiceImpl // 'plugin_path' if needed. If the process fails to start, the return value // is NULL. Must be called on the IO thread. PluginProcessHost* FindOrStartNpapiPluginProcess( - int render_process_id, const FilePath& plugin_path); + const FilePath& plugin_path); PpapiPluginProcessHost* FindOrStartPpapiPluginProcess( - int render_process_id, const FilePath& plugin_path, const FilePath& profile_data_directory, PpapiPluginProcessHost::PluginClient* client); PpapiPluginProcessHost* FindOrStartPpapiBrokerProcess( - int render_process_id, const FilePath& plugin_path); + const FilePath& plugin_path); // Opens a channel to a plugin process for the given mime type, starting // a new plugin process if necessary. This must be called on the IO thread @@ -138,12 +137,10 @@ class CONTENT_EXPORT PluginServiceImpl const GURL& page_url, const std::string& mime_type, PluginProcessHost::Client* client); - void OpenChannelToPpapiPlugin(int render_process_id, - const FilePath& plugin_path, + void OpenChannelToPpapiPlugin(const FilePath& plugin_path, const FilePath& profile_data_directory, PpapiPluginProcessHost::PluginClient* client); - void OpenChannelToPpapiBroker(int render_process_id, - const FilePath& path, + void OpenChannelToPpapiBroker(const FilePath& path, PpapiPluginProcessHost::BrokerClient* client); // Cancels opening a channel to a NPAPI plugin. @@ -199,8 +196,7 @@ class CONTENT_EXPORT PluginServiceImpl // Helper so we can finish opening the channel after looking up the // plugin. - void FinishOpenChannelToPlugin(int render_process_id, - const FilePath& plugin_path, + void FinishOpenChannelToPlugin(const FilePath& plugin_path, PluginProcessHost::Client* client); #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) -- cgit v1.1