summaryrefslogtreecommitdiffstats
path: root/remoting/webapp
diff options
context:
space:
mode:
authorlambroslambrou@google.com <lambroslambrou@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 23:22:11 +0000
committerlambroslambrou@google.com <lambroslambrou@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 23:22:11 +0000
commitc055db4cddfad4641efeb048dbbf4c2099ad2aac (patch)
tree9be09a8755b0c8a088716ad3ff8196fb65752186 /remoting/webapp
parent577d34d097cd736c8138a0ba585c83ebf05b59d8 (diff)
downloadchromium_src-c055db4cddfad4641efeb048dbbf4c2099ad2aac.zip
chromium_src-c055db4cddfad4641efeb048dbbf4c2099ad2aac.tar.gz
chromium_src-c055db4cddfad4641efeb048dbbf4c2099ad2aac.tar.bz2
Show transitional UI on session disconnect.
BUG=None TEST=Manual Review URL: http://codereview.chromium.org/7531015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
-rw-r--r--remoting/webapp/me2mom/choice.html20
-rw-r--r--remoting/webapp/me2mom/remoting.js3
2 files changed, 16 insertions, 7 deletions
diff --git a/remoting/webapp/me2mom/choice.html b/remoting/webapp/me2mom/choice.html
index d3f099b..9690159 100644
--- a/remoting/webapp/me2mom/choice.html
+++ b/remoting/webapp/me2mom/choice.html
@@ -197,13 +197,21 @@ found in the LICENSE file.
<div data-ui-mode="client.connect-failed"
class="message">
<span id="connect-error-message" class="error-state"></span>
- <div class="centered-button">
- <button type="button" class="big-button"
- onclick="remoting.setMode('client.unconnected');">
- OK
- </button>
- </div>
</div> <!-- client.connect-failed -->
+
+ <div data-ui-mode="client.session-finished"
+ class="message">
+ You are no longer connected to the remote desktop.
+ </div> <!-- client.session-finished -->
+
+ <div data-ui-mode="client.connect-failed client.session-finished"
+ class="centered-button">
+ <button type="button" class="big-button"
+ onclick="remoting.setMode(
+ remoting.AppMode.CLIENT_UNCONNECTED);">
+ OK
+ </button>
+ </div>
</div> <!-- client-panel -->
<footer class="choice-footer">
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/me2mom/remoting.js
index adfa928..f042470 100644
--- a/remoting/webapp/me2mom/remoting.js
+++ b/remoting/webapp/me2mom/remoting.js
@@ -23,6 +23,7 @@ remoting.AppMode = {
CLIENT_UNCONNECTED: 'client.unconnected',
CLIENT_CONNECTING: 'client.connecting',
CLIENT_CONNECT_FAILED: 'client.connect-failed',
+ CLIENT_SESSION_FINISHED: 'client.session-finished',
HOST: 'host',
HOST_UNSHARED: 'host.unshared',
HOST_WAITING_FOR_CODE: 'host.waiting-for-code',
@@ -611,7 +612,7 @@ remoting.disconnect = function() {
remoting.session.disconnect();
remoting.session = null;
remoting.debug.log('Disconnected.');
- remoting.setMode(remoting.AppMode.CLIENT_UNCONNECTED);
+ remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED);
var accessCode = document.getElementById('access-code-entry');
accessCode.value = '';
}