From 84b8c80778fa2c728470c557c379ef34a1b525b0 Mon Sep 17 00:00:00 2001
From: rockot <rockot@chromium.org>
Date: Mon, 5 Jan 2015 20:27:49 -0800
Subject: Update mojo sdk to rev e3719475d5971283d1d2250533d53066b2ff9797
Includes diff from comment #6 at
https://codereview.chromium.org/803173009
BUG=None
TBR=darin@chromium.org
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/835253002
Cr-Commit-Position: refs/heads/master@{#310049}
---
mojo/services/public/js/shell.js | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
(limited to 'mojo/services/public/js/shell.js')
diff --git a/mojo/services/public/js/shell.js b/mojo/services/public/js/shell.js
index fdec4b1..338de5e 100644
--- a/mojo/services/public/js/shell.js
+++ b/mojo/services/public/js/shell.js
@@ -3,17 +3,21 @@
// found in the LICENSE file.
define("mojo/services/public/js/shell", [
+ "mojo/public/js/bindings",
"mojo/public/js/core",
"mojo/public/js/connection",
"mojo/public/interfaces/application/shell.mojom",
"mojo/public/interfaces/application/service_provider.mojom",
- "mojo/services/public/js/service_provider"
-], function(core,
+ "mojo/services/public/js/service_provider",
+], function(bindings,
+ core,
connection,
shellMojom,
serviceProviderMojom,
serviceProvider) {
+ const ProxyBindings = bindings.ProxyBindings;
+ const StubBindings = bindings.StubBindings;
const ServiceProvider = serviceProvider.ServiceProvider;
const ServiceProviderInterface = serviceProviderMojom.ServiceProvider;
const ShellInterface = shellMojom.Shell;
@@ -23,7 +27,8 @@ define("mojo/services/public/js/shell", [
this.shellHandle = shellHandle;
this.proxy = connection.bindProxyHandle(
shellHandle, ShellInterface.client, ShellInterface);
- this.proxy.local$ = app; // The app is the shell's client.
+
+ ProxyBindings(this.proxy).setLocalDelegate(app);
// TODO: call this serviceProviders_
this.applications_ = new Map();
}
@@ -33,9 +38,9 @@ define("mojo/services/public/js/shell", [
if (application)
return application;
- var returnValue = {};
- this.proxy.connectToApplication(url, returnValue);
- application = new ServiceProvider(returnValue.remote$);
+ this.proxy.connectToApplication(url, function(sp) {
+ application = new ServiceProvider(sp);
+ });
this.applications_.set(url, application);
return application;
}
--
cgit v1.1