Pointer watcher modifications to support laser pointer.

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 <string>
 #include <utility>
 
@@ skipping 807 matching lines @@
   window_tree_host_manager_->CreatePrimaryHost(
       ShellInitParamsToAshWindowTreeHostInitParams(init_params));
   aura::Window* root_window = window_tree_host_manager_->GetPrimaryRootWindow();
   wm_shell_->set_root_window_for_new_windows(WmWindowAura::Get(root_window));
 
 #if defined(OS_CHROMEOS)
   resolution_notification_controller_.reset(
       new ResolutionNotificationController);
 #endif
 
-  if (cursor_manager_)
+  if (cursor_manager_) {
     cursor_manager_->SetDisplay(
         display::Screen::GetScreen()->GetPrimaryDisplay());
+//    wm_shell_->SetCursorManager(base::MakeUnique<::wm::CursorManager>(
+//        base::WrapUnique<AshNativeCursorManager>(native_cursor_manager_)));
+    wm_shell_->SetCursorManager(base::WrapUnique<::wm::CursorManager>(
+        cursor_manager_.get()));

[jdufault, 2016/08/11 01:09:57]

This is causing chrome to consistently crash on shut-down.

+  }
 
   accelerator_controller_delegate_.reset(new AcceleratorControllerDelegateAura);
   wm_shell_->SetAcceleratorController(base::MakeUnique<AcceleratorController>(
       accelerator_controller_delegate_.get(), nullptr));
   wm_shell_->CreateMaximizeModeController();
 
   AddPreTargetHandler(window_tree_host_manager_->input_method_event_handler());
 
 #if defined(OS_CHROMEOS)
   magnifier_key_scroll_handler_ = MagnifierKeyScroller::CreateHandler();
@@ skipping 218 matching lines @@
 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
   return std::unique_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash