summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 07:50:56 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 07:50:56 +0000
commit9ad250b6e17ee57732b57f0c5285f002aad7cf04 (patch)
treea1bb45ba33d67b232f0851cc324e0452886db79f /mojo/shell
parent3295612b187d98b8e64d508fc41595dcc614e8e8 (diff)
downloadchromium_src-9ad250b6e17ee57732b57f0c5285f002aad7cf04.zip
chromium_src-9ad250b6e17ee57732b57f0c5285f002aad7cf04.tar.gz
chromium_src-9ad250b6e17ee57732b57f0c5285f002aad7cf04.tar.bz2
Mojo: Add MessagePipe to core_cpp.h for convenience
Review URL: https://codereview.chromium.org/119563003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/service_manager.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/mojo/shell/service_manager.cc b/mojo/shell/service_manager.cc
index 23928e7..cb774ae 100644
--- a/mojo/shell/service_manager.cc
+++ b/mojo/shell/service_manager.cc
@@ -25,11 +25,10 @@ class ServiceManager::Service : public ShellStub {
Service(ServiceManager* manager, const GURL& url)
: manager_(manager),
url_(url) {
- ScopedMessagePipeHandle shell_handle, service_handle;
- CreateMessagePipe(&shell_handle, &service_handle);
- shell_client_.reset(shell_handle.Pass());
+ MessagePipe pipe;
+ shell_client_.reset(pipe.handle0.Pass());
shell_client_.SetPeer(this);
- manager_->GetLoaderForURL(url)->Load(url, manager_, service_handle.Pass());
+ manager_->GetLoaderForURL(url)->Load(url, manager_, pipe.handle1.Pass());
}
virtual ~Service() {}