Disable scroll-bars in shrink-to-fit mode.

This works around a bug in Chrome whereby scroll-bars are added unnecessarily.

BUG=252796,240772

Review URL: https://chromiumcodereview.appspot.com/17288017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207935 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 0 deletions

diff --git a/remoting/webapp/client_session.js b/remoting/webapp/client_session.js
index f8f76ba..952fd61 100644
--- a/remoting/webapp/client_session.js
+++ b/remoting/webapp/client_session.js
@@ -652,6 +652,14 @@ remoting.ClientSession.prototype.setScreenMode_ =
   if (needsScrollReset) {
     this.scroll_(0, 0);
   }
+
+  // TODO(jamiewalch): crbug.com/252796: Remove this once crbug.com/240772
+  // is fixed.
+  if (this.shrinkToFit_) {
+    document.body.parentNode.classList.add('no-scroll');
+  } else {
+    document.body.parentNode.classList.remove('no-scroll');
+  }
 }
 
 /**
diff --git a/remoting/webapp/main.css b/remoting/webapp/main.css
index 6411f1c..eac75f4 100644
--- a/remoting/webapp/main.css
+++ b/remoting/webapp/main.css
@@ -599,6 +599,12 @@ button {
   opacity: 0.75;
 }
 
+/* TODO(jamiewalch): crbug.com/252796: Remove this once crbug.com/240772
+ * is fixed. */
+.no-scroll {
+  overflow: hidden;
+}
+
 /* TODO(jamiewalch): Reinstate this if we're able to get translations for
  *     "Why is this safe?" that don't overflow in any language.
 #host-setup-dialog {
diff --git a/remoting/webapp/ui_mode.js b/remoting/webapp/ui_mode.js
index 0a425fc..1fb832f 100644
--- a/remoting/webapp/ui_mode.js
+++ b/remoting/webapp/ui_mode.js
@@ -128,6 +128,9 @@ remoting.setMode = function(mode) {
                               false);
     document.removeEventListener('webkitvisibilitychange',
                                  remoting.onVisibilityChanged, false);
+    // TODO(jamiewalch): crbug.com/252796: Remove this once crbug.com/240772
+    // is fixed.
+    document.body.parentNode.classList.remove('no-scroll');
   }
 };