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..033456561f3dc2451bd78d50b9c5fb07dad52487 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -15,18 +15,16 @@
 namespace aura {
 
 class EnvObserver;
-class MonitorChangeObserverX11;
 class MonitorManager;
 class Window;
 
-#if !defined(OS_MACOSX)
-class Dispatcher : public MessageLoop::Dispatcher {
- public:
-  virtual ~Dispatcher() {}
-};
+namespace internal {
+class MonitorChangeObserverX11;
+}
 
+#if !defined(OS_MACOSX)
 // Creates a platform-specific native event dispatcher.
-Dispatcher* CreateDispatcher();
+MessageLoop::Dispatcher* CreateDispatcher();
 #endif
 
 // A singleton object that tracks general state within Aura.
@@ -52,12 +50,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(); }
@@ -74,12 +66,14 @@ class AURA_EXPORT Env {
  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<Dispatcher> dispatcher_;
+  scoped_ptr<MessageLoop::Dispatcher> dispatcher_;
 #endif
 
   static Env* instance_;
@@ -88,7 +82,7 @@ class AURA_EXPORT Env {
   scoped_ptr<MonitorManager> monitor_manager_;
 
 #if defined(USE_X11)
-  scoped_ptr<MonitorChangeObserverX11> monitor_change_observer_;
+  scoped_ptr<internal::MonitorChangeObserverX11> monitor_change_observer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Env);