exo: Fix multi-display hardware cursor

components/exo/wm_helper.h

Index: components/exo/wm_helper.h
diff --git a/components/exo/wm_helper.h b/components/exo/wm_helper.h
index ad0aeb6ac5a49c4ade7b17c4aac25ecff5873d22..3e2bcafcde1f4838ee56103179fa1be827769ca3 100644
--- a/components/exo/wm_helper.h
+++ b/components/exo/wm_helper.h
@@ -8,12 +8,14 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/base/cursor/cursor.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace aura {
 class Window;
 }
 
 namespace display {
+class Display;
 class ManagedDisplayInfo;
 }
 
@@ -48,6 +50,7 @@ class WMHelper {
    public:
     virtual void OnCursorVisibilityChanged(bool is_visible) {}
     virtual void OnCursorSetChanged(ui::CursorSetType cursor_set) {}
+    virtual void OnCursorDisplayChanging(const display::Display& display) {}
 
    protected:
     virtual ~CursorObserver() {}
@@ -110,7 +113,7 @@ class WMHelper {
 
   virtual const display::ManagedDisplayInfo GetDisplayInfo(
       int64_t display_id) const = 0;
-  virtual aura::Window* GetContainer(int container_id) = 0;
+  virtual aura::Window* GetContainer(int64_t display_id, int container_id) = 0;
   virtual aura::Window* GetActiveWindow() const = 0;
   virtual aura::Window* GetFocusedWindow() const = 0;
   virtual ui::CursorSetType GetCursorSet() const = 0;
@@ -122,6 +125,7 @@ class WMHelper {
   virtual bool IsMaximizeModeWindowManagerEnabled() const = 0;
   virtual bool IsSpokenFeedbackEnabled() const = 0;
   virtual void PlayEarcon(int sound_key) const = 0;
+  virtual void SetCursor(gfx::NativeCursor cursor) = 0;
 
  protected:
   WMHelper();
@@ -132,6 +136,7 @@ class WMHelper {
                            aura::Window* lost_focus);
   void NotifyCursorVisibilityChanged(bool is_visible);
   void NotifyCursorSetChanged(ui::CursorSetType cursor_set);
+  void NotifyCursorDisplayChanging(const display::Display& display);
   void NotifyMaximizeModeStarted();
   void NotifyMaximizeModeEnding();
   void NotifyMaximizeModeEnded();