diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/common/child_process_host.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'chrome/common/child_process_host.cc')
| -rw-r--r-- | chrome/common/child_process_host.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc index 9626976..b001eff 100644 --- a/chrome/common/child_process_host.cc +++ b/chrome/common/child_process_host.cc @@ -5,7 +5,7 @@ #include "chrome/common/child_process_host.h" #include "base/command_line.h" -#include "base/histogram.h" +#include "base/metrics/histogram.h" #include "base/path_service.h" #include "chrome/common/child_process_info.h" #include "chrome/common/chrome_constants.h" @@ -138,6 +138,10 @@ void ChildProcessHost::OnChildDied() { delete this; } +bool ChildProcessHost::InterceptMessageFromChild(const IPC::Message& msg) { + return false; +} + ChildProcessHost::ListenerHook::ListenerHook(ChildProcessHost* host) : host_(host) { } |