summaryrefslogtreecommitdiffstats
path: root/content/browser/mojo/mojo_application_host.cc
diff options
context:
space:
mode:
authormorrita <morrita@chromium.org>2014-10-16 17:12:39 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-17 00:13:00 +0000
commit869f0b293620e33800662618bffcd738cdbdde38 (patch)
treebf3110eddade6db9863184de2b2e87955686eb27 /content/browser/mojo/mojo_application_host.cc
parentb7a5a049fe93d6bcfb16ebd4544c16f97404d00b (diff)
downloadchromium_src-869f0b293620e33800662618bffcd738cdbdde38.zip
chromium_src-869f0b293620e33800662618bffcd738cdbdde38.tar.gz
chromium_src-869f0b293620e33800662618bffcd738cdbdde38.tar.bz2
Always activate MojoApplicationHost
Before this change, MojoApplicatioHost was activated only if some browser-side modules requested it. There was no way for renderer to activate it. This CL let MojoApplicationHost always get activated. Now renderer can request services it needs without its own activation flow. R=darin@chromium.org,tsepez@chromium.org TEST=none BUG=none Committed: https://crrev.com/bd0aa4dc467c10a4301e44084d8abbba92a35e56 Cr-Commit-Position: refs/heads/master@{#294969} Committed: https://crrev.com/2c0a563d3019940343e804c7e975bef1bd0f5b54 Cr-Commit-Position: refs/heads/master@{#297551} Review URL: https://codereview.chromium.org/563373002 Cr-Commit-Position: refs/heads/master@{#300021}
Diffstat (limited to 'content/browser/mojo/mojo_application_host.cc')
-rw-r--r--content/browser/mojo/mojo_application_host.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc
index 029fa5e..1821967 100644
--- a/content/browser/mojo/mojo_application_host.cc
+++ b/content/browser/mojo/mojo_application_host.cc
@@ -51,7 +51,7 @@ bool MojoApplicationHost::Init() {
return true;
}
-bool MojoApplicationHost::Activate(IPC::Sender* sender,
+void MojoApplicationHost::Activate(IPC::Sender* sender,
base::ProcessHandle process_handle) {
DCHECK(!did_activate_);
DCHECK(client_handle_.is_valid());
@@ -60,7 +60,6 @@ bool MojoApplicationHost::Activate(IPC::Sender* sender,
PlatformFileFromScopedPlatformHandle(client_handle_.Pass());
did_activate_ = sender->Send(new MojoMsg_Activate(
IPC::GetFileHandleForProcess(client_file, process_handle, true)));
- return did_activate_;
}
void MojoApplicationHost::WillDestroySoon() {