Fix logic surrounding window / root window coordinates in Ash.

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index ce3e7c0cf2e1f0ef3d5daa5160a94ddc00085540..3c36a9bfe9fa0878a3be3d5ac0ddd9d57dc400a9 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1791,32 +1791,13 @@ void RenderWidgetHostViewAura::GetScreenInfo(WebScreenInfo* results) {
 }
 
 gfx::Rect RenderWidgetHostViewAura::GetBoundsInRootWindow() {
-#if defined(OS_WIN)
-  // aura::Window::GetBoundsInScreen doesn't take non-client area into
-  // account.
-  RECT window_rect = {0};
-
-  aura::Window* top_level = window_->GetToplevelWindow();
-  aura::WindowTreeHost* host = top_level->GetHost();
-  if (!host)
-    return top_level->GetBoundsInScreen();
-  HWND hwnd = host->GetAcceleratedWidget();
-  ::GetWindowRect(hwnd, &window_rect);
-  gfx::Rect rect(window_rect);
-
-  // Maximized windows are outdented from the work area by the frame thickness
-  // even though this "frame" is not painted.  This confuses code (and people)
-  // that think of a maximized window as corresponding exactly to the work area.
-  // Correct for this by subtracting the frame thickness back off.
-  if (::IsZoomed(hwnd)) {
-    rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME),
-               GetSystemMetrics(SM_CYSIZEFRAME));
-  }
+  gfx::Rect rect = window_->GetToplevelWindow()->GetBoundsInScreen();
 
-  return gfx::win::ScreenToDIPRect(rect);
-#else
-  return window_->GetToplevelWindow()->GetBoundsInScreen();
+#if defined(OS_WIN)
+  rect = gfx::win::ScreenToDIPRect(rect);
 #endif
+
+  return rect;
 }
 
 void RenderWidgetHostViewAura::GestureEventAck(