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

ui/views/widget/native_widget_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/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 331 matching lines @@
 InputMethod* NativeWidgetAura::CreateInputMethod() {
   aura::RootWindow* root_window = window_->GetRootWindow();
   ui::InputMethod* host =
       root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
   InputMethod* input_method = new InputMethodBridge(this, host);
   input_method->Init(GetWidget());
   return input_method;
 }
 
 void NativeWidgetAura::CenterWindow(const gfx::Size& size) {
-  gfx::Rect parent_bounds(window_->parent()->GetScreenBounds());
+  gfx::Rect parent_bounds(window_->parent()->GetBoundsInRootWindow());
   // When centering window, we take the intersection of the host and
   // the parent. We assume the root window represents the visible
   // rect of a single screen.
   gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestWindow(window_);
   parent_bounds = parent_bounds.Intersect(work_area);
 
   // If |window_|'s transient parent's bounds are big enough to fit it, then we
   // center it with respect to the transient parent.
   if (window_->transient_parent()) {
     gfx::Rect transient_parent_rect = window_->transient_parent()->
-        GetScreenBounds().Intersect(work_area);
+        GetBoundsInRootWindow().Intersect(work_area);
     if (transient_parent_rect.height() >= size.height() &&
         transient_parent_rect.width() >= size.width())
       parent_bounds = transient_parent_rect;
   }
 
   gfx::Rect window_bounds(
       parent_bounds.x() + (parent_bounds.width() - size.width()) / 2,
       parent_bounds.y() + (parent_bounds.height() - size.height()) / 2,
       size.width(),
       size.height());
@@ skipping 39 matching lines @@
   //NOTIMPLEMENTED();
 }
 
 void NativeWidgetAura::InitModalType(ui::ModalType modal_type) {
   if (modal_type != ui::MODAL_TYPE_NONE)
     window_->SetProperty(aura::client::kModalKey, modal_type);
 }
 
 gfx::Rect NativeWidgetAura::GetWindowScreenBounds() const {
 #if defined(ENABLE_DIP)
-  return ConvertRectFromMonitor(window_->GetScreenBounds());
+  return ConvertRectFromMonitor(window_->GetBoundsInRootWindow());
 #else
-  return window_->GetScreenBounds();
+  gfx::Rect bounds = window_->GetBoundsInRootWindow();
+  if (desktop_helper_.get())
+    bounds = desktop_helper_->ChangeRootWindowBoundsToScreenBounds(bounds);
+  return bounds;
 #endif
 }
 
 gfx::Rect NativeWidgetAura::GetClientAreaScreenBounds() const {
   // View-to-screen coordinate system transformations depend on this returning
   // the full window bounds, for example View::ConvertPointToScreen().
 #if defined(ENABLE_DIP)
-  return ConvertRectFromMonitor(window_->GetScreenBounds());
+  return ConvertRectFromMonitor(window_->GetBoundsInRootWindow());
 #else
-  return window_->GetScreenBounds();
+  gfx::Rect bounds = window_->GetBoundsInRootWindow();
+  if (desktop_helper_.get())
+    bounds = desktop_helper_->ChangeRootWindowBoundsToScreenBounds(bounds);
+  return bounds;
 #endif
 }
 
 gfx::Rect NativeWidgetAura::GetRestoredBounds() const {
   // Restored bounds should only be relevant if the window is minimized or
   // maximized. However, in some places the code expectes GetRestoredBounds()
   // to return the current window bounds if the window is not in either state.
   if (!IsMinimized() && !IsMaximized() && !IsFullscreen())
     return window_->bounds();
   gfx::Rect* restore_bounds =
@@ skipping 603 matching lines @@
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::Env::GetInstance()->is_mouse_button_down();
 }
 
 }  // namespace internal
 }  // namespace views