Keep the mouse cursor within desktop

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 73 matching lines @@
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
 #if defined(USE_X11)
-#include "ui/aura/monitor_change_observer_x11.h"
+#include "ash/monitor/monitor_change_observer_x11.h"
 #endif
 
 namespace ash {
 
 namespace {
 
 using aura::Window;
 using views::Widget;
 
 // Creates a new window for use as a container.
@@ skipping 362 matching lines @@
 }
 
 internal::WorkspaceController* Shell::TestApi::workspace_controller() {
   return shell_->workspace_controller_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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),
       shelf_(NULL),
       root_window_layout_(NULL),
       status_widget_(NULL) {
   gfx::Screen::SetInstance(screen_);
   ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
 }
 
@@ skipping 49 matching lines @@
 
   DCHECK(instance_ == this);
   instance_ = NULL;
 }
 
 // static
 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_;
 }
 
 // static
 Shell* Shell::GetInstance() {
   DCHECK(instance_);
   return instance_;
 }
@@ skipping 289 matching lines @@
   desktop_background_controller_->SetDesktopBackgroundImageMode(
       GetWallpaper(user_wallpaper_delegate_->GetUserWallpaperIndex()));
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash