Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(796)

Unified Diff: sky/viewer/internals.cc

Issue 868463008: Remove Client relationship between mojo.Shell/mojo.Application (Closed) Base URL: git@github.com:domokit/mojo.git@app_impl_init
Patch Set: fix android Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/viewer/internals.cc
diff --git a/sky/viewer/internals.cc b/sky/viewer/internals.cc
index 09db9802b52685d57f0c68d3a33f17e1bd969379..aca762a867a820e2aa4c07fd06de3aa8a4fc8010 100644
--- a/sky/viewer/internals.cc
+++ b/sky/viewer/internals.cc
@@ -99,10 +99,10 @@ mojo::Handle Internals::ConnectToEmbedderService(
// owns the handle and is expected to use it to create the JS Application for
// the DocumentView.
mojo::Handle Internals::PassShellProxyHandle() {
- mojo::MessagePipe pipe;
- if (!shell_binding_.is_bound())
- shell_binding_.Bind(pipe.handle0.Pass());
- return pipe.handle1.release();
+ mojo::ShellPtr shell;
+ if (!shell_binding_.is_bound())
+ shell_binding_.Bind(GetProxy(&shell));
+ return shell.PassMessagePipe().release();
}
void Internals::ConnectToApplication(
« mojo/public/cpp/application/application_impl.h ('K') | « sky/viewer/content_handler_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698