Ash/aura split: NativeWidgetAura::GetWindowScreenBounds() should return screen bounds.

ui/views/widget/desktop_native_widget_helper_aura.cc

Index: ui/views/widget/desktop_native_widget_helper_aura.cc
diff --git a/ui/views/widget/desktop_native_widget_helper_aura.cc b/ui/views/widget/desktop_native_widget_helper_aura.cc
index d05c0620cf3ebc29ae54a1ff32233675fca2de73..26af57e473a2460532d184dda5261466b4761240 100644
--- a/ui/views/widget/desktop_native_widget_helper_aura.cc
+++ b/ui/views/widget/desktop_native_widget_helper_aura.cc
@@ -49,14 +49,24 @@ aura::RootWindow* DesktopNativeWidgetHelperAura::GetRootWindow() {
   return root_window_.get();
 }
 
-gfx::Rect DesktopNativeWidgetHelperAura::ModifyAndSetBounds(gfx::Rect bounds) {
-  if (root_window_.get() && !bounds.IsEmpty()) {
-    root_window_->SetHostBounds(bounds);
-    bounds.set_x(0);
-    bounds.set_y(0);
+gfx::Rect DesktopNativeWidgetHelperAura::ModifyAndSetBounds(
+    const gfx::Rect& bounds) {
+  gfx::Rect out_bounds = bounds;
+  if (root_window_.get() && !out_bounds.IsEmpty()) {
+    root_window_->SetHostBounds(out_bounds);
+    out_bounds.set_x(0);
+    out_bounds.set_y(0);
   }
 
-  return bounds;
+  return out_bounds;
+}
+
+gfx::Rect DesktopNativeWidgetHelperAura::ChangeRootWindowBoundsToScreenBounds(
+    const gfx::Rect& bounds) {
+  gfx::Rect out_bounds = bounds;
+  if (root_window_.get())
+    out_bounds.Offset(root_window_->GetHostOrigin());
+  return out_bounds;
 }
 
 ////////////////////////////////////////////////////////////////////////////////