exo: Fix multi-display hardware cursor

components/exo/wm_helper_ash.h

Index: components/exo/wm_helper_ash.h
diff --git a/components/exo/wm_helper_ash.h b/components/exo/wm_helper_ash.h
index ea4c3b47fe560259a28d013a182042bdb7c1bac4..049a857376ec25f798a9963f2e47ed0b6d37c0b1 100644
--- a/components/exo/wm_helper_ash.h
+++ b/components/exo/wm_helper_ash.h
@@ -8,6 +8,7 @@
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/accessibility_observer.h"
 #include "ash/display/window_tree_host_manager.h"
+#include "ash/wm/ash_native_cursor_manager.h"
 #include "base/macros.h"
 #include "components/exo/wm_helper.h"
 #include "ui/aura/client/cursor_client_observer.h"
@@ -23,6 +24,7 @@ class WMHelperAsh : public WMHelper,
                     public aura::client::FocusChangeObserver,
                     public aura::client::CursorClientObserver,
                     public ash::AccessibilityObserver,
+                    public ash::AshNativeCursorManager::Observer,
                     public ash::ShellObserver,
                     public ash::WindowTreeHostManager::Observer,
                     public ui::InputDeviceEventObserver {
@@ -33,7 +35,7 @@ class WMHelperAsh : public WMHelper,
   // Overridden from WMHelper:
   const display::ManagedDisplayInfo GetDisplayInfo(
       int64_t display_id) const override;
-  aura::Window* GetContainer(int container_id) override;
+  aura::Window* GetContainer(int64_t display_id, int container_id) override;
   aura::Window* GetActiveWindow() const override;
   aura::Window* GetFocusedWindow() const override;
   ui::CursorSetType GetCursorSet() const override;
@@ -45,6 +47,7 @@ class WMHelperAsh : public WMHelper,
   bool IsMaximizeModeWindowManagerEnabled() const override;
   bool IsSpokenFeedbackEnabled() const override;
   void PlayEarcon(int sound_key) const override;
+  void SetCursor(gfx::NativeCursor cursor) override;
 
   // Overridden from aura::client::ActivationChangeObserver:
   void OnWindowActivated(
@@ -60,6 +63,9 @@ class WMHelperAsh : public WMHelper,
   void OnCursorVisibilityChanged(bool is_visible) override;
   void OnCursorSetChanged(ui::CursorSetType cursor_set) override;
 
+  // Overridden from ash::AshNativeCursorManager::Observer:
+  void OnCursorDisplayChanging(const display::Display& display) override;
+
   // Overridden from ash::AccessibilityObserver:
   void OnAccessibilityModeChanged(
       ash::AccessibilityNotificationVisibility notify) override;