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

Unified Diff: remoting/webapp/app_remoting/js/app_remoting.js

Issue 1082383002: [Webapp Refactor] Remove remoting.clientSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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: remoting/webapp/app_remoting/js/app_remoting.js
diff --git a/remoting/webapp/app_remoting/js/app_remoting.js b/remoting/webapp/app_remoting/js/app_remoting.js
index e1749d820077daf75a946fcaf24c8aeb9dca8a6f..5043e045b6f6310ff4da61dc0b22db0eb5c32c21 100644
--- a/remoting/webapp/app_remoting/js/app_remoting.js
+++ b/remoting/webapp/app_remoting/js/app_remoting.js
@@ -93,6 +93,10 @@ remoting.AppRemoting.prototype.getApplicationName = function() {
return manifest.name;
};
+remoting.AppRemoting.prototype.getActivity = function() {
kelvinp 2015/04/14 23:16:32 This will be fixed to expose the correct activity
+ return null;
+};
+
/**
* @param {!remoting.Error} error The failure reason.
* @override {remoting.ApplicationInterface}
@@ -155,10 +159,6 @@ remoting.AppRemoting.prototype.startApplication_ = function(token) {
remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
- var idleDetector = new remoting.IdleDetector(
- document.getElementById('idle-dialog'),
- remoting.app.disconnect.bind(remoting.app));
-
/**
* @param {string} tokenUrl Token-issue URL received from the host.
* @param {string} hostPublicKey Host public key (DER and Base64
@@ -212,6 +212,11 @@ remoting.AppRemoting.prototype.onConnected = function(connectionInfo) {
connectionInfo.plugin().extensions().register(this);
+ var session = connectionInfo.session();
+ var idleDetector = new remoting.IdleDetector(
kelvinp 2015/04/14 23:16:32 The IdleDetector should be started only when the s
+ document.getElementById('idle-dialog'),
+ session.disconnect.bind(session, remoting.Error.none()));
+
this.connectedView_ = new remoting.AppConnectedView(
document.getElementById('client-container'), connectionInfo);

Powered by Google App Engine
This is Rietveld 408576698