summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-21 21:44:28 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-21 21:44:28 +0000
commit1935d6c9624e079aba3bbe8555fc6f4ca5c6d68a (patch)
treeffe3e054e03301c57bea9e4bbf8956aca92cd8ea /remoting
parentf01e04aed8383712b0a407ecd23d3c43f1367721 (diff)
downloadchromium_src-1935d6c9624e079aba3bbe8555fc6f4ca5c6d68a.zip
chromium_src-1935d6c9624e079aba3bbe8555fc6f4ca5c6d68a.tar.gz
chromium_src-1935d6c9624e079aba3bbe8555fc6f4ca5c6d68a.tar.bz2
Turn timer off once connection has been accepted.
BUG=90055 TEST=Set up a chromoting session. let it sit there for 5 minutes. Do you disconnect? Review URL: http://codereview.chromium.org/7484009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/me2mom/remoting.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/me2mom/remoting.js
index 9244922..1382569 100644
--- a/remoting/webapp/me2mom/remoting.js
+++ b/remoting/webapp/me2mom/remoting.js
@@ -353,6 +353,7 @@ function onStateChanged_() {
}
} else if (state == plugin.CONNECTED) {
remoting.setHostMode('shared');
+ disableTimeoutCountdown_();
} else if (state == plugin.DISCONNECTED) {
setGlobalMode(remoting.AppMode.HOST);
remoting.setHostMode('unshared');