Make cursors work on win aura.

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/aura/client/dispatcher_client.h"
-#include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/desktop/desktop_activation_client.h"
 #include "ui/aura/desktop/desktop_cursor_client.h"
 #include "ui/aura/desktop/desktop_dispatcher_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/shared/input_method_event_filter.h"
 #include "ui/aura/shared/root_window_capture_client.h"
 #include "ui/aura/window_property.h"
+#include "ui/views/widget/desktop_screen_position_client_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/hwnd_subclass.h"
 #include "ui/views/widget/widget_message_filter.h"
 #elif defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #include "ui/views/widget/x11_desktop_handler.h"
 #include "ui/views/widget/x11_desktop_window_move_client.h"
 #include "ui/views/widget/x11_window_event_filter.h"
 #endif
 
 namespace views {
 
 DEFINE_WINDOW_PROPERTY_KEY(
     aura::Window*, kViewsWindowForRootWindow, NULL);
 
-namespace {
-
-// Client that always offsets by the toplevel RootWindow of the passed
-// in child NativeWidgetAura.
-class DesktopScreenPositionClient
-    : public aura::client::ScreenPositionClient {
- public:
-  DesktopScreenPositionClient() {}
-  virtual ~DesktopScreenPositionClient() {}
-
-  // aura::client::ScreenPositionClient overrides:
-  virtual void ConvertPointToScreen(const aura::Window* window,
-                                    gfx::Point* point) OVERRIDE {
-    const aura::RootWindow* root_window = window->GetRootWindow();
-    aura::Window::ConvertPointToTarget(window, root_window, point);
-    gfx::Point origin = root_window->GetHostOrigin();
-    point->Offset(origin.x(), origin.y());
-  }
-
-  virtual void ConvertPointFromScreen(const aura::Window* window,
-                                      gfx::Point* point) OVERRIDE {
-    const aura::RootWindow* root_window = window->GetRootWindow();
-    gfx::Point origin = root_window->GetHostOrigin();
-    point->Offset(-origin.x(), -origin.y());
-    aura::Window::ConvertPointToTarget(root_window, window, point);
-  }
-
-  virtual void SetBounds(aura::Window* window,
-                         const gfx::Rect& bounds,
-                         const gfx::Display& display) OVERRIDE {
-    // TODO: Use the 3rd parameter, |display|.
-    gfx::Point origin = bounds.origin();
-    aura::RootWindow* root = window->GetRootWindow();
-    aura::Window::ConvertPointToTarget(window->parent(), root, &origin);
-
-#if !defined(OS_WIN)
-    if  (window->type() == aura::client::WINDOW_TYPE_CONTROL) {
-      window->SetBounds(gfx::Rect(origin, bounds.size()));
-      return;
-    } else if (window->type() == aura::client::WINDOW_TYPE_POPUP) {
-      // The caller expects windows we consider "embedded" to be placed in the
-      // screen coordinate system. So we need to offset the root window's
-      // position (which is in screen coordinates) from these bounds.
-      gfx::Point host_origin = root->GetHostOrigin();
-      origin.Offset(-host_origin.x(), -host_origin.y());
-      window->SetBounds(gfx::Rect(origin, bounds.size()));
-      return;
-    }
-#endif  // !defined(OS_WIN)
-    root->SetHostBounds(bounds);
-    window->SetBounds(gfx::Rect(bounds.size()));
-  }
-};
-
-}  // namespace
-
 DesktopNativeWidgetHelperAura::DesktopNativeWidgetHelperAura(
     NativeWidgetAura* widget)
     : widget_(widget),
       window_(NULL),
       root_window_event_filter_(NULL),
       is_embedded_window_(false) {
 }
 
 DesktopNativeWidgetHelperAura::~DesktopNativeWidgetHelperAura() {
   if (window_)
@@ skipping 64 matching lines @@
   // Pass ownership of the filter to the root_window.
   root_window_->SetEventFilter(root_window_event_filter_);
 
   input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
   input_method_filter_->SetInputMethodPropertyInRootWindow(root_window_.get());
   root_window_event_filter_->AddFilter(input_method_filter_.get());
 
   capture_client_.reset(
       new aura::shared::RootWindowCaptureClient(root_window_.get()));
 
-  cursor_client_.reset(new aura::DesktopCursorClient(root_window_.get()));
-  aura::client::SetCursorClient(root_window_.get(), cursor_client_.get());
-
 #if defined(USE_X11)
   x11_window_event_filter_.reset(
       new X11WindowEventFilter(root_window_.get(), activation_client, widget_));
   x11_window_event_filter_->SetUseHostWindowBorders(false);
   root_window_event_filter_->AddFilter(x11_window_event_filter_.get());
 
   if (params.type == Widget::InitParams::TYPE_MENU) {
     ::Window window = root_window_->GetAcceleratedWidget();
     XSetWindowAttributes attributes;
     memset(&attributes, 0, sizeof(attributes));
@@ skipping 12 matching lines @@
   aura::client::SetDispatcherClient(root_window_.get(),
                                     new aura::DesktopDispatcherClient);
 #if defined(USE_X11)
   // TODO(ben): A window implementation of this will need to be written.
   x11_window_move_client_.reset(new X11DesktopWindowMoveClient);
   root_window_event_filter_->AddFilter(x11_window_move_client_.get());
   aura::client::SetWindowMoveClient(root_window_.get(),
                                     x11_window_move_client_.get());
 #endif
 
+#if !defined(OS_WIN)  // Windows does this in DesktopRootWindowHostWin.
+  cursor_client_.reset(new aura::DesktopCursorClient(root_window_.get()));
+  aura::client::SetCursorClient(root_window_.get(), cursor_client_.get());
+
   position_client_.reset(new DesktopScreenPositionClient());
   aura::client::SetScreenPositionClient(root_window_.get(),
                                         position_client_.get());
+#endif
 }
 
 void DesktopNativeWidgetHelperAura::PostInitialize() {
 #if defined(OS_WIN)
   DCHECK(root_window_->GetAcceleratedWidget());
   hwnd_message_filter_.reset(new WidgetMessageFilter(root_window_.get(),
       widget_->GetWidget()));
   ui::HWNDSubclass::AddFilterToTarget(root_window_->GetAcceleratedWidget(),
                                       hwnd_message_filter_.get());
 #endif
@@ skipping 59 matching lines @@
   widget_->GetWidget()->Close();
 }
 
 void DesktopNativeWidgetHelperAura::OnRootWindowMoved(
     const aura::RootWindow* root,
     const gfx::Point& new_origin) {
   widget_->GetWidget()->OnNativeWidgetMove();
 }
 
 }  // namespace views