diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 04:29:16 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 04:29:16 +0000 |
commit | 0d6e9bd0a2788f03f07f4b90a222fe06270b79b5 (patch) | |
tree | 3fc6241baab067ed8e2ad6269d6bbe671d1f5fe2 /content/browser/browser_child_process_host.h | |
parent | 5ef8e376b54fe7c38dcf3bae8219b3cabae7597c (diff) | |
download | chromium_src-0d6e9bd0a2788f03f07f4b90a222fe06270b79b5.zip chromium_src-0d6e9bd0a2788f03f07f4b90a222fe06270b79b5.tar.gz chromium_src-0d6e9bd0a2788f03f07f4b90a222fe06270b79b5.tar.bz2 |
Move content_notification_types.h from content\common to content\public\browser. I dropped the "content" from the name to match other files whose chrome version adds a "chrome_" prefix. I also moved it to the browser directory since notifications are only used in the browser process. I will move the other notification files in future changes.
BUG=98716
Review URL: http://codereview.chromium.org/8331001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_child_process_host.h')
-rw-r--r-- | content/browser/browser_child_process_host.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/content/browser/browser_child_process_host.h b/content/browser/browser_child_process_host.h index 499b632..d9be9c2 100644 --- a/content/browser/browser_child_process_host.h +++ b/content/browser/browser_child_process_host.h @@ -96,17 +96,20 @@ class CONTENT_EXPORT BrowserChildProcessHost : virtual base::TerminationStatus GetChildTerminationStatus(int* exit_code); // Overrides from ChildProcessHost - virtual void OnChildDisconnected(); - virtual void ShutdownStarted(); - virtual void Notify(int type); + virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; + virtual void OnChildDisconnected() OVERRIDE; + virtual void ShutdownStarted() OVERRIDE; // Extends the base class implementation and removes this host from // the host list. Calls ChildProcessHost::ForceShutdown - virtual void ForceShutdown(); + virtual void ForceShutdown() OVERRIDE; // Controls whether the child process should be terminated on browser // shutdown. Default is to always terminate. void SetTerminateChildOnShutdown(bool terminate_on_shutdown); + // Sends the given notification on the UI thread. + void Notify(int type); + private: // By using an internal class as the ChildProcessLauncher::Client, we can // intercept OnProcessLaunched and do our own processing before @@ -118,6 +121,7 @@ class CONTENT_EXPORT BrowserChildProcessHost : private: BrowserChildProcessHost* host_; }; + ClientHook client_; scoped_ptr<ChildProcessLauncher> child_process_; #if defined(OS_WIN) |