summaryrefslogtreecommitdiffstats
path: root/remoting/webapp
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-15 21:32:27 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-15 21:32:27 +0000
commitc8bcb21e5eb4cb81836e6a2b52286834282559ab (patch)
treed7cb6c67d90a3fb6dcdc385a7e5bf142fdf9e46c /remoting/webapp
parent63ee22c754cb4f152f8d139d3778a5e54a6063d6 (diff)
downloadchromium_src-c8bcb21e5eb4cb81836e6a2b52286834282559ab.zip
chromium_src-c8bcb21e5eb4cb81836e6a2b52286834282559ab.tar.gz
chromium_src-c8bcb21e5eb4cb81836e6a2b52286834282559ab.tar.bz2
[Chromoting] The webapp should consider the host being enabled when the service is starting.
BUG=141281 Review URL: https://chromiumcodereview.appspot.com/10855182 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
-rw-r--r--remoting/webapp/host_controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/webapp/host_controller.js b/remoting/webapp/host_controller.js
index 8fd69a6..fd1019c 100644
--- a/remoting/webapp/host_controller.js
+++ b/remoting/webapp/host_controller.js
@@ -80,7 +80,8 @@ remoting.HostController.prototype.getConsent = function(callback) {
remoting.HostController.prototype.updateDom = function() {
var match = '';
var state = this.state();
- var enabled = (state == remoting.HostController.State.STARTED);
+ var enabled = (state == remoting.HostController.State.STARTING) ||
+ (state == remoting.HostController.State.STARTED);
var supported = (state != remoting.HostController.State.NOT_IMPLEMENTED);
remoting.updateModalUi(enabled ? 'enabled' : 'disabled', 'data-daemon-state');
document.getElementById('daemon-control').hidden = !supported;