Aura desktop: Show resize cursors again.

ui/views/widget/desktop_native_widget_helper_aura.cc

Index: ui/views/widget/desktop_native_widget_helper_aura.cc
diff --git a/ui/views/widget/desktop_native_widget_helper_aura.cc b/ui/views/widget/desktop_native_widget_helper_aura.cc
index ad68fafa168ebc20d0d6a8b85db2a93de3a5afdf..3fd78c893e736a08a5b6ef6c6a37121da8c7bfd2 100644
--- a/ui/views/widget/desktop_native_widget_helper_aura.cc
+++ b/ui/views/widget/desktop_native_widget_helper_aura.cc
@@ -6,8 +6,8 @@
 
 #include "ui/aura/client/dispatcher_client.h"
 #include "ui/aura/client/screen_position_client.h"
-#include "ui/aura/cursor_manager.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"
@@ -125,8 +125,6 @@ void DesktopNativeWidgetHelperAura::PreInitialize(
     // will probably be SetBounds()ed soon.
     bounds.set_size(gfx::Size(100, 100));
   }
-  // TODO(erg): Implement aura::CursorManager::Delegate to control
-  // cursor's shape and visibility.
 
   aura::FocusManager* focus_manager = NULL;
   aura::DesktopActivationClient* activation_client = NULL;
@@ -157,6 +155,9 @@ void DesktopNativeWidgetHelperAura::PreInitialize(
   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_));