diff options
| author | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 02:58:17 +0000 |
|---|---|---|
| committer | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 02:58:17 +0000 |
| commit | f292f1719c54a79e83eedd44154f1259093d909e (patch) | |
| tree | ec212236e51540388efecb63807d0b8aa4bf7b4a /remoting/webapp | |
| parent | ccb067e65dfc79d5e336c84736fe66e76f5f585a (diff) | |
| download | chromium_src-f292f1719c54a79e83eedd44154f1259093d909e.zip chromium_src-f292f1719c54a79e83eedd44154f1259093d909e.tar.gz chromium_src-f292f1719c54a79e83eedd44154f1259093d909e.tar.bz2 | |
Get the timeout period from the cloud instead of hard-coding it (b/5049410).
BUG=
TEST=
Review URL: http://codereview.chromium.org/7466012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
| -rw-r--r-- | remoting/webapp/me2mom/remoting.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/me2mom/remoting.js index 6bbb67a..8433a90 100644 --- a/remoting/webapp/me2mom/remoting.js +++ b/remoting/webapp/me2mom/remoting.js @@ -309,7 +309,7 @@ function updateTimeoutStyles_() { } } document.getElementById('access-code-countdown').hidden = - (remoting.accessCodeExpiresIn > ACCESS_CODE_TIMER_DISPLAY_THRESHOLD ) || + (remoting.accessCodeExpiresIn > ACCESS_CODE_TIMER_DISPLAY_THRESHOLD) || !remoting.timerRunning; return true; } @@ -345,8 +345,7 @@ function onStateChanged_() { nextFourDigits.innerText = accessCode.substring(i, i + kDigitsPerGroup); accessCodeDisplay.appendChild(nextFourDigits); } - // TODO(jamiewalch): Get the validity period from the cloud. - remoting.accessCodeExpiresIn = 300; + remoting.accessCodeExpiresIn = plugin.accessCodeLifetime; if (remoting.accessCodeExpiresIn > 0) { // Check it hasn't expired. remoting.accessCodeTimerId = setInterval( 'remoting.decrementAccessCodeTimeout_()', 1000); |