From b47610c32597b728ab6975c8e0e2e0f21ef39fc2 Mon Sep 17 00:00:00 2001 From: "darin@google.com" Date: Tue, 5 Aug 2008 23:17:53 +0000 Subject: Convert more consumers of ML::WatchObject to ObjectWatcher. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@408 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/plugin_process_host.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'chrome/browser/plugin_process_host.h') diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h index f4cf06b..e9ea4c5 100644 --- a/chrome/browser/plugin_process_host.h +++ b/chrome/browser/plugin_process_host.h @@ -27,14 +27,14 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef CHROME_BROWSER_PLUGIN_PROCESS_HOST_H__ -#define CHROME_BROWSER_PLUGIN_PROCESS_HOST_H__ +#ifndef CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_ +#define CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_ #include #include "base/basictypes.h" #include "base/id_map.h" -#include "base/message_loop.h" +#include "base/object_watcher.h" #include "base/process.h" #include "base/scoped_ptr.h" #include "base/task.h" @@ -59,7 +59,7 @@ class GURL; // the renderer and plugin processes. class PluginProcessHost : public IPC::Channel::Listener, public IPC::Message::Sender, - public MessageLoop::Watcher { + public base::ObjectWatcher::Delegate { public: PluginProcessHost(PluginService* plugin_service); ~PluginProcessHost(); @@ -75,7 +75,7 @@ class PluginProcessHost : public IPC::Channel::Listener, // IPC::Message::Sender implementation: virtual bool Send(IPC::Message* msg); - // MessageLoop watcher callback + // ObjectWatcher::Delegate implementation: virtual void OnObjectSignaled(HANDLE object); // IPC::Channel::Listener implementation: @@ -159,6 +159,9 @@ class PluginProcessHost : public IPC::Channel::Listener, // The handle to our plugin process. Process process_; + // Used to watch the plugin process handle. + base::ObjectWatcher watcher_; + // true while we're waiting the channel to be opened. In the meantime, // plugin instance requests will be buffered. bool opening_channel_; @@ -179,4 +182,4 @@ class PluginProcessHost : public IPC::Channel::Listener, DISALLOW_EVIL_CONSTRUCTORS(PluginProcessHost); }; -#endif // CHROME_BROWSER_PLUGIN_PROCESS_HOST_H__ +#endif // CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_ -- cgit v1.1