Make aura::clients take Window instead of RootWindow

ui/views/widget/desktop_aura/desktop_screen_position_client.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_aura/desktop_screen_position_client.h"
 
 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/screen.h"
@@ skipping 41 matching lines @@
 
 void DesktopScreenPositionClient::ConvertPointFromScreen(
     const aura::Window* window, gfx::Point* point) {
   const aura::RootWindow* root_window = window->GetRootWindow();
   gfx::Point origin = GetOrigin(root_window);
   point->Offset(-origin.x(), -origin.y());
   aura::Window::ConvertPointToTarget(root_window, window, point);
 }
 
 void DesktopScreenPositionClient::ConvertHostPointToScreen(
-    aura::RootWindow* window, gfx::Point* point) {
-  ConvertPointToScreen(window, point);
+    aura::Window* window, gfx::Point* point) {
+  aura::RootWindow* root_window = window->GetRootWindow();
+  ConvertPointToScreen(root_window, point);
 }
 
 void DesktopScreenPositionClient::SetBounds(
     aura::Window* window,
     const gfx::Rect& bounds,
     const gfx::Display& display) {
   // TODO: Use the 3rd parameter, |display|.
   aura::RootWindow* root = window->GetRootWindow();
 
   if (PositionWindowInScreenCoordinates(window)) {
@@ skipping 14 matching lines @@
       DesktopNativeWidgetAura::ForWindow(window);
   if (desktop_native_widget) {
     root->SetHostBounds(bounds);
     // Setting bounds of root resizes |window|.
   } else {
     window->SetBounds(bounds);
   }
 }
 
 }  // namespace views