Keep the mouse cursor within desktop

ui/aura/env.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 "ui/aura/env.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/single_monitor_manager.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/compositor.h"
 
 #if defined(USE_X11)
 #include "ui/aura/monitor_change_observer_x11.h"
 #endif
 
 namespace aura {
 
 // static
 Env* Env::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, public:
 
 Env::Env()
     : mouse_button_flags_(0),
-      stacking_client_(NULL),
-      monitor_manager_(new internal::SingleMonitorManager)
-#if defined(USE_X11)
-    , monitor_change_observer_(new MonitorChangeObserverX11())
-#endif
-{
-#if !defined(OS_MACOSX)
-  dispatcher_.reset(CreateDispatcher());
-#endif
-  ui::Compositor::Initialize(false);
+      stacking_client_(NULL) {
 }
 
 Env::~Env() {
   ui::Compositor::Terminate();
 }
 
 // static
 Env* Env::GetInstance() {
-  if (!instance_)
+  if (!instance_) {
     instance_ = new Env;
+    instance_->Init();

[oshima, 2012/03/24 18:19:39]

Ben, I had to move init code out of constructor to avoid infinite loop. Let me
know if you have concern or comment. I'll address them in separate CL.

+  }
   return instance_;
 }
 
 // static
 void Env::DeleteInstance() {
   delete instance_;
   instance_ = NULL;
 }
 
 void Env::AddObserver(EnvObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Env::RemoveObserver(EnvObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void Env::SetMonitorManager(MonitorManager* monitor_manager) {
   monitor_manager_.reset(monitor_manager);
+#if defined(USE_X11)
+  // Update the monitor manager with latest info.
+  monitor_change_observer_->NotifyMonitorChange();
+#endif
 }
 
 #if !defined(OS_MACOSX)
 MessageLoop::Dispatcher* Env::GetDispatcher() {
   return dispatcher_.get();
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
+void Env::Init() {
+#if !defined(OS_MACOSX)
+  dispatcher_.reset(CreateDispatcher());
+#endif
+#if defined(USE_X11)
+  monitor_change_observer_.reset(new internal::MonitorChangeObserverX11);
+#endif
+  SetMonitorManager(new internal::SingleMonitorManager);
+  ui::Compositor::Initialize(false);
+}
+
 void Env::NotifyWindowInitialized(Window* window) {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window));
 }
 
 }  // namespace aura