Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(908)

Unified Diff: ui/aura/env.h

Issue 10692170: Aura desktop: Show resize cursors again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/desktop/desktop_cursor_client.cc ('k') | ui/aura/env.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index a6f49ba5f2f4e33f5b9b8db5866ad928b4526d1d..e5a1952a51969a391445fe088a556b61e355e0ff 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -9,12 +9,10 @@
#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"
#include "ui/gfx/point.h"
namespace aura {
-class CursorManager;
class EnvObserver;
class EventFilter;
class DisplayManager;
@@ -78,8 +76,6 @@ class AURA_EXPORT Env {
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.
@@ -109,7 +105,6 @@ class AURA_EXPORT Env {
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_;
« no previous file with comments | « ui/aura/desktop/desktop_cursor_client.cc ('k') | ui/aura/env.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698