diff options
| author | Steven Bennetts <stevenjb@chromium.org> | 2015-08-28 10:38:12 -0700 |
|---|---|---|
| committer | Steven Bennetts <stevenjb@chromium.org> | 2015-08-28 17:40:07 +0000 |
| commit | fba7c7dbf2f19d701cbe5fa97ff2ce29b10e9f91 (patch) | |
| tree | bc041b20f489336cbb307b6ff0383aefcf390377 /remoting/webapp/base | |
| parent | 9474b717466c79553eb03c9ceafd4a35882d4ee1 (diff) | |
| download | chromium_src-fba7c7dbf2f19d701cbe5fa97ff2ce29b10e9f91.zip chromium_src-fba7c7dbf2f19d701cbe5fa97ff2ce29b10e9f91.tar.gz chromium_src-fba7c7dbf2f19d701cbe5fa97ff2ce29b10e9f91.tar.bz2 | |
Bumping closure compiler:
compiler.jar: v20150609-234-g0726b76 -> v20150729-236-gad656a1
chrome_extensions.js: 95c5162db52ad99b67070dd5c6bc777dae0cd86b -> 0ede01e5b8167af5c239a63e1cafd730b5870a28
BUG=none
For minor closure chanes:
R=dbeam@chromium.org
TBR=fukino@chromium.org, jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/1314433006 .
Cr-Commit-Position: refs/heads/master@{#346175}
Diffstat (limited to 'remoting/webapp/base')
| -rw-r--r-- | remoting/webapp/base/js/base.js | 4 | ||||
| -rw-r--r-- | remoting/webapp/base/js/suspend_detector.js | 3 | ||||
| -rw-r--r-- | remoting/webapp/base/js/xhr.js | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/remoting/webapp/base/js/base.js b/remoting/webapp/base/js/base.js index 0e490af..602d129 100644 --- a/remoting/webapp/base/js/base.js +++ b/remoting/webapp/base/js/base.js @@ -645,9 +645,7 @@ base.DomEventHook.prototype.dispose = function() { /** * An event hook implementation for Chrome Events. * - * @param {ChromeEvent| - * chrome.contextMenus.ClickedEvent| - * chrome.app.runtime.LaunchEvent} src + * @param {ChromeEvent|chrome.contextMenus.ClickedEvent|ChromeObjectEvent} src * @param {!Function} listener * * @constructor diff --git a/remoting/webapp/base/js/suspend_detector.js b/remoting/webapp/base/js/suspend_detector.js index 241da49..db87fb9 100644 --- a/remoting/webapp/base/js/suspend_detector.js +++ b/remoting/webapp/base/js/suspend_detector.js @@ -24,7 +24,8 @@ remoting.SuspendDetector = function(opt_maxSuspendInMs) { base.inherits(this, base.EventSourceImpl); this.defineEvents(base.values(remoting.SuspendDetector.Events)); - if (!Number.isInteger(opt_maxSuspendInMs)) { + if (opt_maxSuspendInMs == undefined || + !Number.isInteger(opt_maxSuspendInMs)) { opt_maxSuspendInMs = TIMER_INACCURACY_IN_MS; } diff --git a/remoting/webapp/base/js/xhr.js b/remoting/webapp/base/js/xhr.js index 66afde4..4815ec1 100644 --- a/remoting/webapp/base/js/xhr.js +++ b/remoting/webapp/base/js/xhr.js @@ -364,7 +364,7 @@ remoting.AutoRetryXhr = function(params, opt_maxRetryAttempts) { * Retry for 60 x 250ms = 15s by default. * @private */ - this.retryAttemptsRemaining_ = + this.retryAttemptsRemaining_ = opt_maxRetryAttempts != undefined && Number.isInteger(opt_maxRetryAttempts) ? opt_maxRetryAttempts : 60; /** @private */ this.deferred_ = new base.Deferred(); |