diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 01:48:52 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 01:48:52 +0000 |
| commit | 829c2841a0e30b9f08453566ffc52d2c386a9045 (patch) | |
| tree | b916ff2699e97a13f027d3e2cb60be781c0e18c8 /chrome/common/child_process_host.cc | |
| parent | 5c0b8e45fa1260f311d71073c8a9b89db199d992 (diff) | |
| download | chromium_src-829c2841a0e30b9f08453566ffc52d2c386a9045.zip chromium_src-829c2841a0e30b9f08453566ffc52d2c386a9045.tar.gz chromium_src-829c2841a0e30b9f08453566ffc52d2c386a9045.tar.bz2 | |
Port plugin messages.
Review URL: http://codereview.chromium.org/49050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/child_process_host.cc')
| -rw-r--r-- | chrome/common/child_process_host.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc index b22d751..7f934b0 100644 --- a/chrome/common/child_process_host.cc +++ b/chrome/common/child_process_host.cc @@ -14,12 +14,10 @@ #include "chrome/common/ipc_logging.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "chrome/common/plugin_messages.h" #include "chrome/common/process_watcher.h" #include "chrome/common/result_codes.h" -#if defined(OS_WIN) -#include "chrome/common/plugin_messages.h" -#endif namespace { typedef std::list<ChildProcessHost*> ChildProcessList; @@ -153,7 +151,6 @@ void ChildProcessHost::ListenerHook::OnMessageReceived( msg, host_, &msg_is_ok); if (!handled) { -#if defined(OS_WIN) if (msg.type() == PluginProcessHostMsg_ShutdownRequest::ID) { // Must remove the process from the list now, in case it gets used for a // new instance before our watcher tells us that the process terminated. @@ -161,9 +158,6 @@ void ChildProcessHost::ListenerHook::OnMessageReceived( if (host_->CanShutdown()) host_->Send(new PluginProcessMsg_Shutdown()); } else { -#else - { -#endif host_->OnMessageReceived(msg); } } @@ -180,9 +174,7 @@ void ChildProcessHost::ListenerHook::OnMessageReceived( void ChildProcessHost::ListenerHook::OnChannelConnected(int32 peer_pid) { host_->opening_channel_ = false; host_->OnChannelConnected(peer_pid); -#if defined(OS_WIN) host_->Send(new PluginProcessMsg_AskBeforeShutdown()); -#endif // Notify in the main loop of the connection. host_->Notify(NotificationType::CHILD_PROCESS_HOST_CONNECTED); |