Revert 99893 - Center the desktop if it's smaller than the frame.

Apply a drop-shadow to make it clear where the desktop edge is.
Fix desktop resize handling to cope respect the scaling setting.

BUG=
TEST=

Review URL: http://codereview.chromium.org/7821017

TBR=wez@chromium.org
Review URL: http://codereview.chromium.org/7857013

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

3 files changed, 6 insertions, 22 deletions

diff --git a/remoting/webapp/me2mom/choice.css b/remoting/webapp/me2mom/choice.css
index 8bd7a4d..85a7bb5 100644
--- a/remoting/webapp/me2mom/choice.css
+++ b/remoting/webapp/me2mom/choice.css
@@ -227,10 +227,7 @@ label {
 }
 
 #session-mode {
-  left: 50%;
-  top: 50%;
-  position: absolute;
-  -webkit-box-shadow: 0 0 8px 0 black;
+  width: 100%;
   -webkit-user-select: none;
 }
 
diff --git a/remoting/webapp/me2mom/client_session.js b/remoting/webapp/me2mom/client_session.js
index 202bfb1..c993aa4c 100644
--- a/remoting/webapp/me2mom/client_session.js
+++ b/remoting/webapp/me2mom/client_session.js
@@ -364,10 +364,11 @@ remoting.ClientSession.prototype.setState_ = function(state) {
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.onDesktopSizeChanged_ = function() {
-  remoting.debug.log('desktop size changed: ' +
-                     this.plugin.desktopWidth + 'x' +
-                     this.plugin.desktopHeight);
-  this.setScaleToFit(remoting.scaleToFit);
+  var width = this.plugin.desktopWidth;
+  var height = this.plugin.desktopHeight;
+  remoting.debug.log('desktop size changed: ' + width + 'x' + height);
+  this.plugin.width = width;
+  this.plugin.height = height;
 };
 
 /**
@@ -406,19 +407,6 @@ remoting.ClientSession.prototype.setScaleToFit = function(shouldScale) {
     this.plugin.width = this.plugin.desktopWidth;
     this.plugin.height = this.plugin.desktopHeight;
   }
-
-  // Resize the plugin's container.  The container's style places its origin at
-  // the center of the page, so we use -ve margins to move that origin to the
-  // center of the container, rather than its top-left corner, so that it will
-  // appear centered on the page.
-  if (this.plugin.parentNode) {
-    var parentNode = this.plugin.parentNode;
-    parentNode.style["width"] = this.plugin.width + "px";
-    parentNode.style["height"] = this.plugin.height + "px";
-    parentNode.style["margin-left"] = -(this.plugin.width/2) + "px";
-    parentNode.style["margin-top"] = -(this.plugin.height/2) + "px";
-  }
-
   remoting.debug.log('plugin size is now: ' +
                      this.plugin.width + ' x ' + this.plugin.height + '.');
   this.plugin.setScaleToFit(shouldScale);
diff --git a/remoting/webapp/me2mom/toolbar.css b/remoting/webapp/me2mom/toolbar.css
index 0b67cbf..cf09311 100644
--- a/remoting/webapp/me2mom/toolbar.css
+++ b/remoting/webapp/me2mom/toolbar.css
@@ -13,7 +13,6 @@
   -webkit-transition-delay: 0.7s;
   font-size: 13px;
   pointer-events: none;
-  z-index: 1;
 }
 
 .toolbar-container button {