Keep the mouse cursor within desktop

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index f70a499c96b19eb0d270423fea44136f4aea9c50..a3db32cb0e37bfe4d0711f18296620802b1da429 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -91,7 +91,7 @@
 #endif
 
 #if defined(USE_X11)
-#include "ui/aura/monitor_change_observer_x11.h"
+#include "ash/monitor/monitor_change_observer_x11.h"
 #endif
 
 namespace ash {
@@ -474,7 +474,11 @@ internal::WorkspaceController* Shell::TestApi::workspace_controller() {
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
-    : root_window_(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()),
+    :
+#if defined(USE_X11)
+      monitor_change_observer_(new internal::MonitorChangeObserverX11),
+#endif
+      root_window_(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()),
       screen_(new ScreenAsh(root_window_.get())),
       root_filter_(NULL),
       delegate_(delegate),
@@ -544,9 +548,6 @@ Shell* Shell::CreateInstance(ShellDelegate* delegate) {
   CHECK(!instance_);
   aura::Env::GetInstance()->SetMonitorManager(
       new internal::MultiMonitorManager());
-#if defined(USE_X11)
-  aura::Env::GetInstance()->monitor_change_observer()->NotifyMonitorChange();
-#endif
   instance_ = new Shell(delegate);
   instance_->Init();
   return instance_;