Aura/ash: On Desktops, use a aura::client to resolve screen coordinates.

ui/views/widget/native_widget_helper_aura.h

Index: ui/views/widget/native_widget_helper_aura.h
diff --git a/ui/views/widget/native_widget_helper_aura.h b/ui/views/widget/native_widget_helper_aura.h
index c8ec63c53b732346e24e4974f5456d9915d19631..49111d085ee5c8915ca212fd37893696d69efd0a 100644
--- a/ui/views/widget/native_widget_helper_aura.h
+++ b/ui/views/widget/native_widget_helper_aura.h
@@ -18,8 +18,9 @@ class VIEWS_EXPORT NativeWidgetHelperAura {
   virtual ~NativeWidgetHelperAura() {}
 
   // Called at the start of InitNativeWidget; determines whether we should
-  // set up a root_window_ for this widget.
-  virtual void PreInitialize(const Widget::InitParams& params) = 0;
+  // set up a root_window_ for this widget/window pair.
+  virtual void PreInitialize(aura::Window* window,
+                             const Widget::InitParams& params) = 0;
 
   // Called at the end of InitNativeWidget; i.e. after the NativeWidgetAura's
   // aura::Window has been initialized.
@@ -35,11 +36,6 @@ class VIEWS_EXPORT NativeWidgetHelperAura {
   // |root_window_|, and returns modified bounds to set the origin to
   // zero. Otherwise, pass through in_bounds.
   virtual gfx::Rect ModifyAndSetBounds(const gfx::Rect& bounds) = 0;
-
-  // Takes bounds relative to the RootWindow and changes them to be relative to
-  // the screen.
-  virtual gfx::Rect ChangeRootWindowBoundsToScreenBounds(
-      const gfx::Rect& bounds) = 0;
 };
 
 }  // namespace views