| Index: chrome/browser/renderer_host/plugin_info_message_filter.h
|
| diff --git a/chrome/browser/renderer_host/plugin_info_message_filter.h b/chrome/browser/renderer_host/plugin_info_message_filter.h
|
| index 8cade7295a9930aaae9bfc1e36cdc4b03b249528..f0f6e3571e11f12fc38796cc96181211bd9bd750 100644
|
| --- a/chrome/browser/renderer_host/plugin_info_message_filter.h
|
| +++ b/chrome/browser/renderer_host/plugin_info_message_filter.h
|
| @@ -18,6 +18,7 @@
|
| struct ChromeViewHostMsg_GetPluginInfo_Status;
|
| class GURL;
|
| class HostContentSettingsMap;
|
| +class PluginFinder;
|
| class Profile;
|
|
|
| namespace content {
|
| @@ -26,6 +27,9 @@ class ResourceContext;
|
|
|
| namespace webkit {
|
| struct WebPluginInfo;
|
| +namespace npapi {
|
| +class PluginGroup;
|
| +}
|
| }
|
|
|
| // This class filters out incoming IPC messages requesting plug-in information.
|
| @@ -41,10 +45,11 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
|
| Context();
|
| ~Context();
|
|
|
| - void DecidePluginStatus(const GetPluginInfo_Params& params,
|
| - ChromeViewHostMsg_GetPluginInfo_Status* status,
|
| - webkit::WebPluginInfo* plugin,
|
| - std::string* actual_mime_type) const;
|
| + void DecidePluginStatus(
|
| + const GetPluginInfo_Params& params,
|
| + const webkit::WebPluginInfo& plugin,
|
| + PluginFinder* plugin_finder,
|
| + ChromeViewHostMsg_GetPluginInfo_Status* status) const;
|
| bool FindEnabledPlugin(int render_view_id,
|
| const GURL& url,
|
| const GURL& top_origin_url,
|
| @@ -52,7 +57,7 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
|
| ChromeViewHostMsg_GetPluginInfo_Status* status,
|
| webkit::WebPluginInfo* plugin,
|
| std::string* actual_mime_type) const;
|
| - void GetPluginContentSetting(const webkit::WebPluginInfo* plugin,
|
| + void GetPluginContentSetting(const webkit::WebPluginInfo& plugin,
|
| const GURL& policy_url,
|
| const GURL& plugin_url,
|
| const std::string& resource,
|
| @@ -89,6 +94,12 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
|
| IPC::Message* reply_msg,
|
| const std::vector<webkit::WebPluginInfo>& plugins);
|
|
|
| + void GotPluginFinder(const GetPluginInfo_Params& params,
|
| + IPC::Message* reply_msg,
|
| + const webkit::WebPluginInfo& plugin,
|
| + const std::string& actual_mime_type,
|
| + PluginFinder* plugin_finder);
|
| +
|
| Context context_;
|
|
|
| base::WeakPtrFactory<PluginInfoMessageFilter> weak_ptr_factory_;
|
|
|