summaryrefslogtreecommitdiffstats
path: root/remoting/webapp/host_screen.js
diff options
context:
space:
mode:
authorjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 00:55:05 +0000
committerjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 00:55:05 +0000
commita66018945680e1fd0ccfbdd7098633dd25ae5ab4 (patch)
tree6b0d5c4b64efcf69bbbfe005b031d2c9bc520458 /remoting/webapp/host_screen.js
parentebd153d479c0634dbd032e0f17a3232aa109eb06 (diff)
downloadchromium_src-a66018945680e1fd0ccfbdd7098633dd25ae5ab4.zip
chromium_src-a66018945680e1fd0ccfbdd7098633dd25ae5ab4.tar.gz
chromium_src-a66018945680e1fd0ccfbdd7098633dd25ae5ab4.tar.bz2
Make the host UI appear as an overlay on the home screen.
BUG=115350 TEST=Manual Review URL: https://chromiumcodereview.appspot.com/9458001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp/host_screen.js')
-rw-r--r--remoting/webapp/host_screen.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/webapp/host_screen.js b/remoting/webapp/host_screen.js
index 2af3b84..01571ac 100644
--- a/remoting/webapp/host_screen.js
+++ b/remoting/webapp/host_screen.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -42,7 +42,7 @@ remoting.tryShare = function() {
onNatTraversalPolicyChanged_(true); // Hide warning by default.
remoting.setMode(remoting.AppMode.HOST_WAITING_FOR_CODE);
- document.getElementById('cancel-button').disabled = false;
+ document.getElementById('cancel-share-button').disabled = false;
disableTimeoutCountdown_();
var div = document.getElementById('host-plugin-container');
@@ -158,6 +158,7 @@ function showShareError_(errorTag) {
* @return {void} Nothing.
*/
remoting.cancelShare = function() {
+ document.getElementById('cancel-share-button').disabled = true;
remoting.debug.log('Canceling share...');
remoting.lastShareWasCancelled = true;
try {