Cursor state should be global for desktop Aura

ui/views/widget/desktop_aura/desktop_native_widget_aura.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/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 182 matching lines @@
 
  private:
   DesktopNativeWidgetAura* desktop_native_widget_aura_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusManagerEventHandler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, public:
 
+DesktopNativeCursorManager* DesktopNativeWidgetAura::native_cursor_manager_ =
+    NULL;
+views::corewm::CursorManager* DesktopNativeWidgetAura::cursor_manager_ = NULL;
+
 DesktopNativeWidgetAura::DesktopNativeWidgetAura(
     internal::NativeWidgetDelegate* delegate)
     : ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       close_widget_factory_(this),
       can_activate_(true),
       desktop_root_window_host_(NULL),
       content_window_container_(NULL),
       content_window_(new aura::Window(this)),
       native_widget_delegate_(delegate),
       last_drop_operation_(ui::DragDropTypes::DRAG_NONE),
@@ skipping 65 matching lines @@
   // |root_window_| is still valid, but DesktopRootWindowHost is nearly
   // destroyed. Do cleanup here of members DesktopRootWindowHost may also use.
   aura::client::SetFocusClient(root->window(), NULL);
   aura::client::SetActivationClient(root->window(), NULL);
   focus_client_.reset();
 
   aura::client::SetDispatcherClient(root->window(), NULL);
   dispatcher_client_.reset();
 
   aura::client::SetCursorClient(root->window(), NULL);
-  cursor_client_.reset();
+  native_cursor_manager_->RemoveRootWindow(root);
 
   aura::client::SetScreenPositionClient(root->window(), NULL);
   position_client_.reset();
 
   aura::client::SetDragDropClient(root->window(), NULL);
   drag_drop_client_.reset();
 
   aura::client::SetEventClient(root->window(), NULL);
   event_client_.reset();
 }
@@ skipping 75 matching lines @@
   // OnRootWindowHostCreated() is invoked.
 
   // CEF sets focus to the window the user clicks down on.
   // TODO(beng): see if we can't do this some other way. CEF seems a heavy-
   //             handed way of accomplishing focus.
   // No event filter for aura::Env. Create CompoundEvnetFilter per RootWindow.
   root_window_event_filter_ = new corewm::CompoundEventFilter;
   // Pass ownership of the filter to the root_window.
   root_window_->window()->SetEventFilter(root_window_event_filter_);
 
+  // |root_window_| must be added to |native_cursor_manager_| before
+  // OnRootWindowCreated() is called.
+  if (!native_cursor_manager_) {
+    native_cursor_manager_ = new DesktopNativeCursorManager(
+        DesktopCursorLoaderUpdater::Create());
+  }
+  if (!cursor_manager_) {
+    cursor_manager_ = new views::corewm::CursorManager(
+        scoped_ptr<corewm::NativeCursorManager>(native_cursor_manager_));
+  }
+  native_cursor_manager_->AddRootWindow(root_window_.get());
+  aura::client::SetCursorClient(root_window_->window(), cursor_manager_);
+
   desktop_root_window_host_->OnRootWindowCreated(root_window_.get(), params);
 
   UpdateWindowTransparency();
 
   capture_client_.reset(new DesktopCaptureClient(root_window_->window()));
 
   corewm::FocusController* focus_controller =
       new corewm::FocusController(new DesktopFocusRules(content_window_));
   focus_client_.reset(focus_controller);
   aura::client::SetFocusClient(root_window_->window(), focus_controller);
   aura::client::SetActivationClient(root_window_->window(), focus_controller);
   root_window_->window()->AddPreTargetHandler(focus_controller);
 
   dispatcher_client_.reset(new DesktopDispatcherClient);
   aura::client::SetDispatcherClient(root_window_->window(),
                                     dispatcher_client_.get());
 
-  DesktopNativeCursorManager* desktop_native_cursor_manager =
-      new views::DesktopNativeCursorManager(
-          root_window_.get(),
-          DesktopCursorLoaderUpdater::Create());
-  cursor_client_.reset(
-      new views::corewm::CursorManager(
-          scoped_ptr<corewm::NativeCursorManager>(
-              desktop_native_cursor_manager)));
-  aura::client::SetCursorClient(root_window_->window(), cursor_client_.get());
-
   position_client_.reset(new DesktopScreenPositionClient());
   aura::client::SetScreenPositionClient(root_window_->window(),
                                         position_client_.get());
 
   InstallInputMethodEventFilter();
 
   drag_drop_client_ = desktop_root_window_host_->CreateDragDropClient(
-      desktop_native_cursor_manager);
+      native_cursor_manager_);
   aura::client::SetDragDropClient(root_window_->window(),
                                   drag_drop_client_.get());
 
   focus_client_->FocusWindow(content_window_);
 
   OnRootWindowHostResized(root_window_.get());
 
   root_window_->AddRootWindowObserver(this);
 
   window_tree_client_.reset(
@@ skipping 680 matching lines @@
   input_method_event_filter_->SetInputMethodPropertyInRootWindow(
       root_window_->window());
   root_window_event_filter_->AddHandler(input_method_event_filter_.get());
 }
 
 void DesktopNativeWidgetAura::UpdateWindowTransparency() {
   content_window_->SetTransparent(ShouldUseNativeFrame());
 }
 
 }  // namespace views