diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 07:51:54 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 07:51:54 +0000 |
| commit | f177ffd84b0f1b94de05fa0166520783cb5cddb9 (patch) | |
| tree | 54f755e0de2d845cd2d8b481f08c528911ce62d2 /chrome/service | |
| parent | 57c1b56f4ae39e8cb1cd805fb46653423d4e5456 (diff) | |
| download | chromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.zip chromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.tar.gz chromium_src-f177ffd84b0f1b94de05fa0166520783cb5cddb9.tar.bz2 | |
Revert 118415 - Add a Content API around BrowserChildProcessHost, similar to what was done with ChildProcessHost. Now classes like PluginProcessHost don't derive from it, but instead use composition.
I've also moved the iterator class into its own file in the public directory. Since classes don't derive from BrowserChildProcessHost and so can't static_cast from it, I added a template helper that does this.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9150017
TBR=jam@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
| -rw-r--r-- | chrome/service/service_utility_process_host.cc | 7 | ||||
| -rw-r--r-- | chrome/service/service_utility_process_host.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc index e3a0000..91f6627 100644 --- a/chrome/service/service_utility_process_host.cc +++ b/chrome/service/service_utility_process_host.cc @@ -152,6 +152,10 @@ FilePath ServiceUtilityProcessHost::GetUtilityProcessCmd() { return ChildProcessHost::GetChildPath(flags); } +bool ServiceUtilityProcessHost::CanShutdown() { + return true; +} + void ServiceUtilityProcessHost::OnChildDisconnected() { if (waiting_for_reply_) { // If we are yet to receive a reply then notify the client that the @@ -162,6 +166,9 @@ void ServiceUtilityProcessHost::OnChildDisconnected() { delete this; } +void ServiceUtilityProcessHost::ShutdownStarted() { +} + bool ServiceUtilityProcessHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ServiceUtilityProcessHost, message) diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h index 3fb3a45..0b91776 100644 --- a/chrome/service/service_utility_process_host.h +++ b/chrome/service/service_utility_process_host.h @@ -108,7 +108,9 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate { virtual FilePath GetUtilityProcessCmd(); // ChildProcessHostDelegate implementation: + virtual bool CanShutdown() OVERRIDE; virtual void OnChildDisconnected() OVERRIDE; + virtual void ShutdownStarted() OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: |