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..53f4cb7ff3586e8a315a5e9c8e23de6a52704744 100644
--- a/components/exo/wm_helper_ash.h
+++ b/components/exo/wm_helper_ash.h
@@ -29,12 +29,13 @@ 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* GetPrimaryDisplayContainer(int container_id) override;
   aura::Window* GetActiveWindow() const override;
   aura::Window* GetFocusedWindow() const override;
   ui::CursorSetType GetCursorSet() const override;
+  const display::Display& GetCursorDisplay() const override;
   void AddPreTargetHandler(ui::EventHandler* handler) override;
   void PrependPreTargetHandler(ui::EventHandler* handler) override;
   void RemovePreTargetHandler(ui::EventHandler* handler) override;
@@ -55,6 +56,7 @@ class WMHelperAsh : public WMHelper,
   // Overridden from aura::client::CursorClientObserver:
   void OnCursorVisibilityChanged(bool is_visible) override;
   void OnCursorSetChanged(ui::CursorSetType cursor_set) override;
+  void OnCursorDisplayChanged(const display::Display& display) override;
 
   // Overridden from ash::ShellObserver:
   void OnMaximizeModeStarted() override;