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

Unified Diff: shell/external_application_listener.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: shell/external_application_listener.cc
diff --git a/shell/external_application_listener.cc b/shell/external_application_listener.cc
index fb9e6bb5154c98a1cc04bfecf75ebcd0eb920f9e..5b267b0ac9916296936fc63bdbbfc050dd582f0b 100644
--- a/shell/external_application_listener.cc
+++ b/shell/external_application_listener.cc
@@ -50,7 +50,8 @@ class ExternalApplicationListener::RegistrarImpl
virtual void Register(
const String& app_url,
Array<String> args,
- const mojo::Callback<void(ShellPtr)>& callback) override;
+ const mojo::Callback<void(InterfaceRequest<Application>)>& callback)
+ override;
const RegisterCallback register_callback_;
};
@@ -174,12 +175,13 @@ void ExternalApplicationListener::RegistrarImpl::OnConnectionError() {
void ExternalApplicationListener::RegistrarImpl::Register(
const String& app_url,
Array<String> args,
- const mojo::Callback<void(ShellPtr)>& callback) {
- MessagePipe pipe;
+ const mojo::Callback<void(InterfaceRequest<Application>)>& callback) {
+ ApplicationPtr application;
+ InterfaceRequest<Application> application_request = GetProxy(&application);
register_callback_.Run(app_url.To<GURL>(),
args.To<std::vector<std::string>>(),
- pipe.handle0.Pass());
- callback.Run(MakeProxy<Shell>(pipe.handle1.Pass()));
+ application.Pass());
+ callback.Run(application_request.Pass());
}
} // namespace shell

Powered by Google App Engine
This is Rietveld 408576698