Revert "Add shortcut keys to ui scaling"

    Add shortcut keys to ui scaling
    - Round root window size because it can be fractional size
      when root_window_scale_ is specified.
    - Remove scaling option from about:flags.
    - Rotate display where the mouse is in.

    BUG=179997,119268

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

TBR=oshima@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/12690013

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

1 files changed, 3 insertions, 5 deletions

diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 1aa78f9..729ceab 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -36,8 +36,8 @@
 #include "ui/gfx/display.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_conversions.h"
+#include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/screen.h"
-#include "ui/gfx/size_conversions.h"
 
 using std::vector;
 
@@ -771,6 +771,7 @@ void RootWindow::UpdateWindowSize(const gfx::Size& host_size) {
   bounds = ui::ConvertRectToDIP(layer(), bounds);
   gfx::RectF new_bounds(bounds);
   layer()->transform().TransformRect(&new_bounds);
+
   // It makes little sense to scale beyond the original
   // resolution.
   DCHECK_LE(root_window_scale_, GetDeviceScaleFactor());
@@ -781,10 +782,7 @@ void RootWindow::UpdateWindowSize(const gfx::Size& host_size) {
   new_bounds.Scale(root_window_scale_ * root_window_scale_);
   // Ignore the origin because RootWindow's insets are handled by
   // the transform.
-  // Round the size because the bounds is no longer aligned to
-  // backing pixel when |root_window_scale_| is specified
-  // (850 height at 1.25 scale becomes 1062.5 for example.)
-  SetBounds(gfx::Rect(gfx::ToRoundedSize(new_bounds.size())));
+  SetBounds(gfx::Rect(gfx::ToNearestRect(new_bounds).size()));
 }
 
 void RootWindow::OnWindowAddedToRootWindow(Window* attached) {