From 91d9f3d52a1e55a9938416b258e08d3cc445eae4 Mon Sep 17 00:00:00 2001
From: "cpu@chromium.org"
<cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sun, 14 Aug 2011 05:24:44 +0000
Subject: Make WebPluginInfo more generic
- To account for pepper plugins, it grows a type field
- move WebPluginInfo from webkit::npapi to webkit:: and move the files as well.
This will allow us to remove hacks to get pepper plugins to load soon
BUG=89248
TEST=none
Review URL: http://codereview.chromium.org/7648017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96718 0039d316-1c4b-4281-b951-d872f2087c98
---
content/browser/plugin_process_host.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'content/browser/plugin_process_host.h')
diff --git a/content/browser/plugin_process_host.h b/content/browser/plugin_process_host.h
index e337887..63ea1b5 100644
--- a/content/browser/plugin_process_host.h
+++ b/content/browser/plugin_process_host.h
@@ -16,7 +16,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "content/browser/browser_child_process_host.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
+#include "webkit/plugins/webplugininfo.h"
#include "ui/gfx/native_widget_types.h"
namespace gfx {
@@ -45,7 +45,7 @@ class PluginProcessHost : public BrowserChildProcessHost {
// the channel.
virtual int ID() = 0;
virtual bool OffTheRecord() = 0;
- virtual void SetPluginInfo(const webkit::npapi::WebPluginInfo& info) = 0;
+ virtual void SetPluginInfo(const webkit::WebPluginInfo& info) = 0;
// The client should delete itself when one of these methods is called.
virtual void OnChannelOpened(const IPC::ChannelHandle& handle) = 0;
virtual void OnError() = 0;
@@ -59,7 +59,7 @@ class PluginProcessHost : public BrowserChildProcessHost {
// Initialize the new plugin process, returning true on success. This must
// be called before the object can be used.
- bool Init(const webkit::npapi::WebPluginInfo& info, const std::string& locale);
+ bool Init(const webkit::WebPluginInfo& info, const std::string& locale);
// Force the plugin process to shutdown (cleanly).
virtual void ForceShutdown();
@@ -85,7 +85,7 @@ class PluginProcessHost : public BrowserChildProcessHost {
void OnAppActivation();
#endif
- const webkit::npapi::WebPluginInfo& info() const { return info_; }
+ const webkit::WebPluginInfo& info() const { return info_; }
#if defined(OS_WIN)
// Tracks plugin parent windows created on the browser UI thread.
@@ -131,7 +131,7 @@ class PluginProcessHost : public BrowserChildProcessHost {
std::queue<Client*> sent_requests_;
// Information about the plugin.
- webkit::npapi::WebPluginInfo info_;
+ webkit::WebPluginInfo info_;
#if defined(OS_WIN)
// Tracks plugin parent windows created on the UI thread.
--
cgit v1.1