Index: chrome/browser/plugins/plugin_info_message_filter.h |
=================================================================== |
--- chrome/browser/plugins/plugin_info_message_filter.h (revision 212806) |
+++ chrome/browser/plugins/plugin_info_message_filter.h (working copy) |
@@ -25,9 +25,6 @@ |
namespace content { |
class ResourceContext; |
-} |
- |
-namespace webkit { |
struct WebPluginInfo; |
} |
@@ -46,7 +43,7 @@ |
void DecidePluginStatus( |
const GetPluginInfo_Params& params, |
- const webkit::WebPluginInfo& plugin, |
+ const content::WebPluginInfo& plugin, |
const PluginMetadata* plugin_metadata, |
ChromeViewHostMsg_GetPluginInfo_Status* status) const; |
bool FindEnabledPlugin(int render_view_id, |
@@ -54,10 +51,10 @@ |
const GURL& top_origin_url, |
const std::string& mime_type, |
ChromeViewHostMsg_GetPluginInfo_Status* status, |
- webkit::WebPluginInfo* plugin, |
+ content::WebPluginInfo* plugin, |
std::string* actual_mime_type, |
scoped_ptr<PluginMetadata>* plugin_metadata) const; |
- void GetPluginContentSetting(const webkit::WebPluginInfo& plugin, |
+ void GetPluginContentSetting(const content::WebPluginInfo& plugin, |
const GURL& policy_url, |
const GURL& plugin_url, |
const std::string& resource, |
@@ -99,7 +96,7 @@ |
// |base::Bind| doesn't support the required arity <http://crbug.com/98542>. |
void PluginsLoaded(const GetPluginInfo_Params& params, |
IPC::Message* reply_msg, |
- const std::vector<webkit::WebPluginInfo>& plugins); |
+ const std::vector<content::WebPluginInfo>& plugins); |
Context context_; |