Aura desktop: Show resize cursors again.

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
 #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"
 
 class CommandLine;
 
 namespace aura {
 class EventFilter;
 class FocusManager;
 class RootWindow;
 class Window;
@@ skipping 72 matching lines @@
 class VisibilityController;
 class WindowModalityController;
 class WorkspaceController;
 }
 
 // Shell is a singleton object that presents the Shell API and implements the
 // RootWindow's delegate interface.
 //
 // 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;
 
   enum Direction {
     FORWARD,
     BACKWARD
   };
 
   // Accesses private data from a Shell for testing.
@@ skipping 155 matching lines @@
   }
   WindowCycleController* window_cycle_controller() {
     return window_cycle_controller_.get();
   }
   internal::FocusCycler* focus_cycler() {
     return focus_cycler_.get();
   }
   internal::DisplayController* display_controller() {
     return display_controller_.get();
   }
+  CursorManager* cursor_manager() { return &cursor_manager_; }
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
   UserWallpaperDelegate* user_wallpaper_delegate() {
     return user_wallpaper_delegate_.get();
   }
 
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
@@ skipping 162 matching lines @@
 
   // An event filter that silently keeps track of all touch events and controls
   // a heads-up display. This is enabled only if --ash-touch-hud flag is used.
   scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_;
 
 #if defined(OS_CHROMEOS)
   // Controls video output device state.
   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.
   internal::ShelfLayoutManager* shelf_;
 
   // Manages layout of panels. Owned by PanelContainer.
   internal::PanelLayoutManager* panel_layout_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // Widget containing system tray.
   internal::StatusAreaWidget* status_area_widget_;
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_