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 84245f6b7abbed25dc173e0d9b02ab6443df4080..50d295026534860650179f67cb4ee5bc27b8f4c1 100644
--- a/components/exo/wm_helper.h
+++ b/components/exo/wm_helper.h
@@ -14,6 +14,7 @@ class Window;
 }
 
 namespace display {
+class Display;
 class ManagedDisplayInfo;
 }
 
@@ -48,6 +49,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() {}
@@ -98,9 +100,9 @@ class WMHelper {
   void RemoveDisplayConfigurationObserver(
       DisplayConfigurationObserver* observer);
 
-  virtual const display::ManagedDisplayInfo GetDisplayInfo(
+  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;

[reveman, 2017/05/25 10:52:55]

I don't think we need this anymore.

[Dominik Laskowski, 2017/05/31 02:06:27]

Still needed to parent the cursor surface to the primary root window.

[reveman, 2017/05/31 03:33:10]

Isn't this always returning the container for the primary root window? You can
rename it to GetPrimaryDisplayContainer if you like but let's not make it less
specific unless we have to.

[Dominik Laskowski, 2017/05/31 20:35:54]

Renamed to GetPrimaryDisplayContainer.

   virtual aura::Window* GetActiveWindow() const = 0;
   virtual aura::Window* GetFocusedWindow() const = 0;
   virtual ui::CursorSetType GetCursorSet() const = 0;
@@ -120,6 +122,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();