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 21bde11eff85fcc9f3338fe806696d0bfd6cb73d..f6ffab0f8d1821f3008dd7df7c5442888517d8f0 100644
--- a/components/exo/wm_helper_ash.h
+++ b/components/exo/wm_helper_ash.h
@@ -6,6 +6,7 @@
 #define COMPONENTS_EXO_WM_HELPER_ASH_H_
 
 #include "ash/shell_observer.h"
+#include "ash/wm/ash_native_cursor_manager.h"
 #include "ash/wm_display_observer.h"
 #include "base/macros.h"
 #include "components/exo/wm_helper.h"
@@ -21,6 +22,7 @@ class WMHelperAsh : public WMHelper,
                     public aura::client::ActivationChangeObserver,
                     public aura::client::FocusChangeObserver,
                     public aura::client::CursorClientObserver,
+                    public ash::AshNativeCursorManager::Observer,
                     public ash::ShellObserver,
                     public ash::WmDisplayObserver,
                     public ui::InputDeviceEventObserver {
@@ -29,9 +31,9 @@ class WMHelperAsh : public WMHelper,
   ~WMHelperAsh() override;
 
   // Overridden from WMHelper:
-  const display::ManagedDisplayInfo GetDisplayInfo(
+  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;
@@ -56,6 +58,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::ShellObserver:
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnding() override;