diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 07:24:18 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 07:24:18 +0000 |
| commit | a346e5d85135c9c5261ad33a20293bf10ca74468 (patch) | |
| tree | a91d386790b2812936b4b618165b4e411172f095 /chrome/browser/plugin_process_host.h | |
| parent | b9c3a91b0340151f21e3708b8187f295e6cf8cfd (diff) | |
| download | chromium_src-a346e5d85135c9c5261ad33a20293bf10ca74468.zip chromium_src-a346e5d85135c9c5261ad33a20293bf10ca74468.tar.gz chromium_src-a346e5d85135c9c5261ad33a20293bf10ca74468.tar.bz2 | |
rollback r498 and r500 to repair test bustage
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_process_host.h')
| -rw-r--r-- | chrome/browser/plugin_process_host.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h index e9ea4c5..f4cf06b 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 <vector> #include "base/basictypes.h" #include "base/id_map.h" -#include "base/object_watcher.h" +#include "base/message_loop.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 base::ObjectWatcher::Delegate { + public MessageLoop::Watcher { 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); - // ObjectWatcher::Delegate implementation: + // MessageLoop watcher callback virtual void OnObjectSignaled(HANDLE object); // IPC::Channel::Listener implementation: @@ -159,9 +159,6 @@ 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_; @@ -182,4 +179,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__ |