Rework ash::CursorManager into a corewm object, to share code with desktop.

ui/views/widget/desktop_aura/desktop_root_window_host_linux.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_root_window_host_linux.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 #include "base/message_pump_aurax11.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/touch/touch_factory.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/corewm/compound_event_filter.h"
 #include "ui/views/corewm/corewm_switches.h"
+#include "ui/views/corewm/cursor_manager.h"
 #include "ui/views/corewm/focus_controller.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/widget/desktop_aura/desktop_activation_client.h"
-#include "ui/views/widget/desktop_aura/desktop_cursor_client.h"
 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
 #include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
 #include "ui/views/widget/desktop_aura/desktop_layout_manager.h"
+#include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h"
 #include "ui/views/widget/desktop_aura/x11_window_event_filter.h"
 
 namespace views {
 
 DesktopRootWindowHostLinux* DesktopRootWindowHostLinux::g_current_capture =
     NULL;
@@ skipping 185 matching lines @@
   } else {
     focus_client_.reset(new aura::FocusManager);
     aura::client::SetFocusClient(root_window_, focus_client_.get());
     activation_client_.reset(new DesktopActivationClient(root_window_));
   }
 
   dispatcher_client_.reset(new DesktopDispatcherClient);
   aura::client::SetDispatcherClient(root_window_,
                                     dispatcher_client_.get());
 
-  cursor_client_.reset(new DesktopCursorClient(root_window_));
+  cursor_client_.reset(
+      new views::corewm::CursorManager(
+          scoped_ptr<corewm::NativeCursorManager>(
+              new views::DesktopNativeCursorManager(root_window_))));
   aura::client::SetCursorClient(root_window_,
                                 cursor_client_.get());
 
   position_client_.reset(new DesktopScreenPositionClient);
   aura::client::SetScreenPositionClient(root_window_,
                                         position_client_.get());
 
   desktop_native_widget_aura_->InstallInputMethodEventFilter(root_window_);
 
   // TODO(erg): Unify this code once the other consumer goes away.
@@ skipping 544 matching lines @@
 bool DesktopRootWindowHostLinux::ConfineCursorToRootWindow() {
   NOTIMPLEMENTED();
   return false;
 }
 
 void DesktopRootWindowHostLinux::UnConfineCursor() {
   NOTIMPLEMENTED();
 }
 
 void DesktopRootWindowHostLinux::OnCursorVisibilityChanged(bool show) {
-  NOTIMPLEMENTED();
+  // TODO(erg): Conditional on us enabling touch on desktop linux builds, do
+  // the same tap-to-click disabling here that chromeos does.
 }
 
 void DesktopRootWindowHostLinux::MoveCursorTo(const gfx::Point& location) {
   NOTIMPLEMENTED();
 }
 
 void DesktopRootWindowHostLinux::SetFocusWhenShown(bool focus_when_shown) {
   static const char* k_NET_WM_USER_TIME = "_NET_WM_USER_TIME";
   focus_when_shown_ = focus_when_shown;
   if (IsWindowManagerPresent() && !focus_when_shown_) {
@@ skipping 303 matching lines @@
 DesktopRootWindowHost* DesktopRootWindowHost::Create(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const gfx::Rect& initial_bounds) {
   return new DesktopRootWindowHostLinux(native_widget_delegate,
                                         desktop_native_widget_aura,
                                         initial_bounds);
 }
 
 }  // namespace views