Aura desktop: Show resize cursors again.

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 42f27d7e70031cec5f1d86ee28c17a8ed9dc68f6..b9521756a909452fb0cb20588d75b0c3e7024d93 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -10,13 +10,14 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
+#include "ash/wm/cursor_delegate.h"
+#include "ash/wm/cursor_manager.h"
 #include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "ui/aura/cursor_delegate.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/size.h"
 
@@ -108,7 +109,7 @@ class WorkspaceController;
 //
 // Upon creation, the Shell sets itself as the RootWindow's delegate, which
 // takes ownership of the Shell.
-class ASH_EXPORT Shell : aura::CursorDelegate {
+class ASH_EXPORT Shell : ash::CursorDelegate {
  public:
   typedef std::vector<aura::RootWindow*> RootWindowList;
   typedef std::vector<internal::RootWindowController*> RootWindowControllerList;
@@ -281,6 +282,7 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
   internal::DisplayController* display_controller() {
     return display_controller_.get();
   }
+  CursorManager* cursor_manager() { return &cursor_manager_; }
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
@@ -466,6 +468,8 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
   scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
 #endif  // defined(OS_CHROMEOS)
 
+  CursorManager cursor_manager_;
+
   // The shelf for managing the launcher and the status widget in non-compact
   // mode. Shell does not own the shelf. Instead, it is owned by container of
   // the status area.