Pointer watcher modifications to support laser pointer.

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 02dbdfc40f7cc721b0dda0a0b84076c578c4344f..247b04dad39009c0c005a294d745e95378066551 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -27,6 +27,10 @@ class Insets;
 class Point;
 }
 
+namespace wm {
+class CursorManager;
+}
+
 namespace views {
 class PointerWatcher;
 }
@@ -100,6 +104,10 @@ class ASH_EXPORT WmShell {
     return brightness_control_delegate_.get();
   }
 
+  ::wm::CursorManager* cursor_manager() {
+    return cursor_manager_.get();
+  }
+
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
   KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() {
@@ -356,6 +364,9 @@ class ASH_EXPORT WmShell {
   void SetAcceleratorController(
       std::unique_ptr<AcceleratorController> accelerator_controller);
 
+  void SetCursorManager(
+      std::unique_ptr<::wm::CursorManager> cursor_manager);
+
  private:
   friend class AcceleratorControllerTest;
   friend class ScopedRootWindowForNewWindows;
@@ -369,6 +380,7 @@ class ASH_EXPORT WmShell {
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
+  std::unique_ptr<::wm::CursorManager> cursor_manager_;
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate_;