diff options
| author | rockot <rockot@chromium.org> | 2015-01-05 20:27:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-06 04:28:43 +0000 |
| commit | 84b8c80778fa2c728470c557c379ef34a1b525b0 (patch) | |
| tree | 86562f30b06e2046efe90b7c1694ced1c4f451a4 /mojo/services/public/js/shell.js | |
| parent | d1896bcd60222e0999da63947ec60af7506c73d7 (diff) | |
| download | chromium_src-84b8c80778fa2c728470c557c379ef34a1b525b0.zip chromium_src-84b8c80778fa2c728470c557c379ef34a1b525b0.tar.gz chromium_src-84b8c80778fa2c728470c557c379ef34a1b525b0.tar.bz2 | |
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}
Diffstat (limited to 'mojo/services/public/js/shell.js')
| -rw-r--r-- | mojo/services/public/js/shell.js | 17 |
1 files changed, 11 insertions, 6 deletions
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; } |