Keep the mouse cursor within desktop

ui/aura/env.h

Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 4089bff79c877fba5c18e1a504ccf5cafa059a40..691a6f8d2ec91e61b07787f337daa772095c35f3 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -20,13 +20,8 @@ class MonitorManager;
 class Window;
 
 #if !defined(OS_MACOSX)
-class Dispatcher : public MessageLoop::Dispatcher {
- public:
-  virtual ~Dispatcher() {}
-};
-
 // Creates a platform-specific native event dispatcher.
-Dispatcher* CreateDispatcher();
+MessageLoop::Dispatcher* CreateDispatcher();
 #endif
 
 // A singleton object that tracks general state within Aura.
@@ -52,12 +47,6 @@ class AURA_EXPORT Env {
     stacking_client_ = stacking_client;
   }
 
-#if defined(USE_X11)
-  MonitorChangeObserverX11* monitor_change_observer() {
-    return monitor_change_observer_.get();
-  }
-#endif
-
   // Gets/sets MonitorManager. The MonitorManager's ownership is
   // transfered.
   MonitorManager* monitor_manager() { return monitor_manager_.get(); }
@@ -79,7 +68,7 @@ class AURA_EXPORT Env {
 
   ObserverList<EnvObserver> observers_;
 #if !defined(OS_MACOSX)
-  scoped_ptr<Dispatcher> dispatcher_;
+  scoped_ptr<MessageLoop::Dispatcher> dispatcher_;
 #endif
 
   static Env* instance_;
@@ -87,10 +76,6 @@ class AURA_EXPORT Env {
   client::StackingClient* stacking_client_;
   scoped_ptr<MonitorManager> monitor_manager_;
 
-#if defined(USE_X11)
-  scoped_ptr<MonitorChangeObserverX11> monitor_change_observer_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(Env);
 };