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

ui/views/widget/desktop_native_widget_helper_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_native_widget_helper_aura.h"
 
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/desktop/desktop_activation_client.h"
 #include "ui/aura/desktop/desktop_dispatcher_client.h"
@@ skipping 31 matching lines @@
 
 void DesktopNativeWidgetHelperAura::ShowRootWindow() {
   if (root_window_.get())
     root_window_->ShowRootWindow();
 }
 
 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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetHelperAura, aura::RootWindowObserver implementation:
 
 void DesktopNativeWidgetHelperAura::OnRootWindowResized(
     const aura::RootWindow* root,
     const gfx::Size& old_size) {
   DCHECK_EQ(root, root_window_.get());
   widget_->SetBounds(gfx::Rect(root->GetHostSize()));
 }
 
 void DesktopNativeWidgetHelperAura::OnRootWindowHostClosed(
     const aura::RootWindow* root) {
   DCHECK_EQ(root, root_window_.get());
   widget_->GetWidget()->Close();
 }
 
 }  // namespace views