Aura/ash split: Look for the ScreenPositionClient on the Window, not the RootWindow.

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 57 matching lines @@
 }
 
 const gfx::Rect* GetRestoreBounds(aura::Window* window) {
   return window->GetProperty(aura::client::kRestoreBoundsKey);
 }
 
 void SetRestoreBounds(aura::Window* window, const gfx::Rect& bounds) {
   window->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds));
 }
 
+void AdjustScreenBounds(aura::Window* window, gfx::Rect* bounds) {
+  aura::client::ScreenPositionClient* screen_position_client =
+      aura::client::GetScreenPositionClient(window);
+  if (screen_position_client) {
+    gfx::Point origin = bounds->origin();
+    screen_position_client->ConvertToScreenPoint(&origin);
+    bounds->set_origin(origin);
+  }
+}
+
 }  // namespace
 
 // Used when SetInactiveRenderingDisabled() is invoked to track when active
 // status changes in such a way that we should enable inactive rendering.
 class NativeWidgetAura::ActiveWindowObserver : public aura::WindowObserver {
  public:
   explicit ActiveWindowObserver(NativeWidgetAura* host) : host_(host) {
     host_->GetNativeView()->GetRootWindow()->AddObserver(this);
     host_->GetNativeView()->AddObserver(this);
   }
@@ skipping 325 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 {
   gfx::Rect bounds = window_->GetBoundsInRootWindow();
-
-  aura::client::ScreenPositionClient* screen_position_client =
-      aura::client::GetScreenPositionClient(window_->GetRootWindow());
-  if (screen_position_client) {
-    gfx::Point origin = bounds.origin();
-    screen_position_client->ConvertToScreenPoint(&origin);
-    bounds.set_origin(origin);
-  }
-
+  AdjustScreenBounds(window_, &bounds);
   return bounds;
 }
 
 gfx::Rect NativeWidgetAura::GetClientAreaScreenBounds() const {
   // View-to-screen coordinate system transformations depend on this returning
   // the full window bounds, for example View::ConvertPointToScreen().
   gfx::Rect bounds = window_->GetBoundsInRootWindow();
-
-  aura::client::ScreenPositionClient* screen_position_client =
-      aura::client::GetScreenPositionClient(window_->GetRootWindow());
-  if (screen_position_client) {
-    gfx::Point origin = bounds.origin();
-    screen_position_client->ConvertToScreenPoint(&origin);
-    bounds.set_origin(origin);
-  }
-
+  AdjustScreenBounds(window_, &bounds);
   return bounds;
 }
 
 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 528 matching lines @@
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::Env::GetInstance()->is_mouse_button_down();
 }
 
 }  // namespace internal
 }  // namespace views