Wire up CursorManager for DesktopWindowTreeHostMus

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/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
@@ skipping 308 matching lines @@
   desktop_window_tree_host_ = NULL;
   content_window_ = NULL;
 
   native_widget_delegate_->OnNativeWidgetDestroyed();
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete this;
 }
 
 void DesktopNativeWidgetAura::OnDesktopWindowTreeHostDestroyed(
     aura::WindowTreeHost* host) {
-  // We explicitly do NOT clear the cursor client property. Since the cursor
-  // manager is a singleton, it can outlive any window hierarchy, and it's
-  // important that objects attached to this destroying window hierarchy have
-  // an opportunity to deregister their observers from the cursor manager.
-  // They may want to do this when they are notified that they're being
-  // removed from the window hierarchy, which happens soon after this
-  // function when DesktopWindowTreeHost* calls DestroyDispatcher().
-  native_cursor_manager_->RemoveHost(host);
+  if (use_desktop_native_cursor_manager_) {
+    // We explicitly do NOT clear the cursor client property. Since the cursor
+    // manager is a singleton, it can outlive any window hierarchy, and it's
+    // important that objects attached to this destroying window hierarchy have
+    // an opportunity to deregister their observers from the cursor manager.
+    // They may want to do this when they are notified that they're being
+    // removed from the window hierarchy, which happens soon after this
+    // function when DesktopWindowTreeHost* calls DestroyDispatcher().
+    native_cursor_manager_->RemoveHost(host);
+  }
 
   aura::client::SetScreenPositionClient(host->window(), NULL);
   position_client_.reset();
 
   aura::client::SetDragDropClient(host->window(), NULL);
   drag_drop_client_.reset();
 
   aura::client::SetEventClient(host->window(), NULL);
   event_client_.reset();
 }
@@ skipping 93 matching lines @@
   // OnWindowTreeHostCreated() 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 CompoundEventFilter per
   // WindowEventDispatcher.
   root_window_event_filter_.reset(new wm::CompoundEventFilter);
   host_->window()->AddPreTargetHandler(root_window_event_filter_.get());
 
-  // The host's dispatcher must be added to |native_cursor_manager_| before
-  // OnNativeWidgetCreated() is called.
-  cursor_reference_count_++;
-  if (!native_cursor_manager_)
-    native_cursor_manager_ = new DesktopNativeCursorManager();
-  if (!cursor_manager_) {
-    cursor_manager_ = new wm::CursorManager(
-        std::unique_ptr<wm::NativeCursorManager>(native_cursor_manager_));
+  use_desktop_native_cursor_manager_ =
+      desktop_window_tree_host_->ShouldUseDesktopNativeCursorManager();
+  if (use_desktop_native_cursor_manager_) {
+    // The host's dispatcher must be added to |native_cursor_manager_| before
+    // OnNativeWidgetCreated() is called.
+    cursor_reference_count_++;
+    if (!native_cursor_manager_)
+      native_cursor_manager_ = new DesktopNativeCursorManager();
+    if (!cursor_manager_) {
+      cursor_manager_ = new wm::CursorManager(
+          std::unique_ptr<wm::NativeCursorManager>(native_cursor_manager_));
+    }
+    native_cursor_manager_->AddHost(host());
+    aura::client::SetCursorClient(host_->window(), cursor_manager_);
   }
-  native_cursor_manager_->AddHost(host());
-  aura::client::SetCursorClient(host_->window(), cursor_manager_);
 
   desktop_window_tree_host_->OnNativeWidgetCreated(params);
 
   UpdateWindowTransparency();
 
   capture_client_.reset(new DesktopCaptureClient(host_->window()));
 
   wm::FocusController* focus_controller =
       new wm::FocusController(new DesktopFocusRules(content_window_));
   focus_client_.reset(focus_controller);
@@ skipping 730 matching lines @@
   if (cursor_reference_count_ == 0) {
     // We are the last DesktopNativeWidgetAura instance, and we are responsible
     // for cleaning up |cursor_manager_|.
     delete cursor_manager_;
     native_cursor_manager_ = NULL;
     cursor_manager_ = NULL;
   }
 }
 
 }  // namespace views