diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:12:35 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:12:35 +0000 |
| commit | e0e75f67163f77051d8f62d5275dbf40627d5398 (patch) | |
| tree | 070d431dc290d9b9a69c79ceeb94ba7574ef1c31 /chrome/browser/plugin_process_host.h | |
| parent | 3370e3b7ee18664a43a9977efeab2166624d0a32 (diff) | |
| download | chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.zip chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.gz chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.bz2 | |
Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6012002
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/5961004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_process_host.h')
| -rw-r--r-- | chrome/browser/plugin_process_host.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h index b98840e..89e368a 100644 --- a/chrome/browser/plugin_process_host.h +++ b/chrome/browser/plugin_process_host.h @@ -18,7 +18,7 @@ #include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/net/resolve_proxy_msg_helper.h" #include "gfx/native_widget_types.h" -#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/glue/plugins/webplugininfo.h" namespace gfx { class Rect; @@ -47,7 +47,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 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; @@ -61,7 +61,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 WebPluginInfo& info, const std::string& locale); // Force the plugin process to shutdown (cleanly). virtual void ForceShutdown(); @@ -92,7 +92,7 @@ class PluginProcessHost : public BrowserChildProcessHost, void OnAppActivation(); #endif - const webkit::npapi::WebPluginInfo& info() const { return info_; } + const WebPluginInfo& info() const { return info_; } #if defined(OS_WIN) // Tracks plugin parent windows created on the browser UI thread. @@ -150,7 +150,7 @@ class PluginProcessHost : public BrowserChildProcessHost, std::queue<Client*> sent_requests_; // Information about the plugin. - webkit::npapi::WebPluginInfo info_; + WebPluginInfo info_; // Helper class for handling PluginProcessHost_ResolveProxy messages (manages // the requests to the proxy service). |