summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 22:02:28 +0000
committerjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 22:02:28 +0000
commitffd3e243e29485e976068402e4874870bdd5e62e (patch)
treef9adc65f75b49ac7115a7731e05d7d5a345c5b86 /remoting
parent765b0844d263260810d05b7979dad283154c6c9a (diff)
downloadchromium_src-ffd3e243e29485e976068402e4874870bdd5e62e.zip
chromium_src-ffd3e243e29485e976068402e4874870bdd5e62e.tar.gz
chromium_src-ffd3e243e29485e976068402e4874870bdd5e62e.tar.bz2
Reset bump-scroll when enabling shrink-to-fit.
Without this, switching from "Original size" to "Shrink to fit" while in content full-screen mode with a non-zero bump-scroll offset causes the scaled desktop to be partially off-screen. BUG=None TEST=Manual Review URL: https://chromiumcodereview.appspot.com/10386017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/client_session.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/webapp/client_session.js b/remoting/webapp/client_session.js
index 669fbc4..a73a8cf 100644
--- a/remoting/webapp/client_session.js
+++ b/remoting/webapp/client_session.js
@@ -69,7 +69,10 @@ remoting.ClientSession = function(hostJid, hostPublicKey, sharedSecret,
/** @type {function():void} @private */
this.callPluginGotFocus_ = function() { that.pluginGotFocus_(); };
/** @type {function():void} @private */
- this.callEnableShrink_ = function() { that.setScaleToFit(true); };
+ this.callEnableShrink_ = function() {
+ that.setScaleToFit(true);
+ that.scroll_(0, 0); // Reset bump-scroll offsets.
+ };
/** @type {function():void} @private */
this.callDisableShrink_ = function() { that.setScaleToFit(false); };
/** @type {function():void} @private */