Aura desktop: Show resize cursors again.

ui/aura/env.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 UI_AURA_ENV_H_
 #define UI_AURA_ENV_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "ui/aura/aura_export.h"
-#include "ui/aura/cursor_manager.h"
 #include "ui/aura/client/stacking_client.h"
 
 namespace aura {
-class CursorManager;
 class EnvObserver;
 class EventFilter;
 class DisplayManager;
 class Window;
 
 namespace internal {
 class DisplayChangeObserverX11;
 }
 
 #if !defined(OS_MACOSX)
@@ skipping 30 matching lines @@
 
   // Gets/sets DisplayManager. The DisplayManager's ownership is
   // transfered.
   DisplayManager* display_manager() { return display_manager_.get(); }
   void SetDisplayManager(DisplayManager* display_manager);
 
   // Env takes ownership of the EventFilter.
   EventFilter* event_filter() { return event_filter_.get(); }
   void SetEventFilter(EventFilter* event_filter);
 
-  CursorManager* cursor_manager() { return &cursor_manager_; }
-
   // Returns the native event dispatcher. The result should only be passed to
   // base::RunLoop(dispatcher), or used to dispatch an event by
   // |Dispatch(const NativeEvent&)| on it. It must never be stored.
 #if !defined(OS_MACOSX)
   MessageLoop::Dispatcher* GetDispatcher();
 #endif
 
  private:
   friend class Window;
 
   void Init();
 
   // Called by the Window when it is initialized. Notifies observers.
   void NotifyWindowInitialized(Window* window);
 
   ObserverList<EnvObserver> observers_;
 #if !defined(OS_MACOSX)
   scoped_ptr<MessageLoop::Dispatcher> dispatcher_;
 #endif
 
   static Env* instance_;
   int mouse_button_flags_;
   bool is_touch_down_;
   client::StackingClient* stacking_client_;
   scoped_ptr<DisplayManager> display_manager_;
   scoped_ptr<EventFilter> event_filter_;
-  CursorManager cursor_manager_;
 
 #if defined(USE_X11)
   scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_