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

Unified Diff: mojo/services/public/js/shell.js

Issue 799113004: Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add mojo's ply to checklicenses whitelist Created 6 years 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
« no previous file with comments | « mojo/services/public/js/service_provider.js ('k') | mojo/services/public/mojo_services_public.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/public/js/shell.js
diff --git a/mojo/services/public/js/shell.js b/mojo/services/public/js/shell.js
index 82d52929f16633402f269fdd9ec4135aed1fe914..c80caa20638f789caec753c2dddae7eaa49d7f67 100644
--- a/mojo/services/public/js/shell.js
+++ b/mojo/services/public/js/shell.js
@@ -3,13 +3,17 @@
// found in the LICENSE file.
define("mojo/services/public/js/shell", [
+ "mojo/public/js/core",
+ "mojo/public/interfaces/application/shell.mojom",
"mojo/public/interfaces/application/service_provider.mojom",
"mojo/services/public/js/service_provider",
-], function(spInterfaceModule, spModule) {
+], function(coreModule, shellInterfaceModule, spInterfaceModule, spModule) {
class Shell {
- constructor(appShell) {
- this.appShell_ = appShell;
+ constructor(shellHandle, app) {
+ this.shellHandle = shellHandle;
+ this.proxy = new shellInterfaceModule.Shell.proxyClass(shellHandle);
+ this.proxy.client$ = app;
this.applications_ = new Map();
}
@@ -18,9 +22,9 @@ define("mojo/services/public/js/shell", [
if (application)
return application;
- var proxy = new spInterfaceModule.ServiceProvider.proxyClass;
- this.appShell_.connectToApplication(url, proxy);
- application = new spModule.ServiceProvider(proxy);
+ var spProxy = new spInterfaceModule.ServiceProvider.proxyClass;
+ this.proxy.connectToApplication(url, spProxy);
+ application = new spModule.ServiceProvider(spProxy);
this.applications_.set(url, application);
return application;
}
@@ -34,6 +38,7 @@ define("mojo/services/public/js/shell", [
application.close();
});
this.applications_.clear();
+ coreModule.close(this.shellHandle);
}
}
« no previous file with comments | « mojo/services/public/js/service_provider.js ('k') | mojo/services/public/mojo_services_public.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698