exo: Fix multi-display hardware cursor

components/exo/wm_helper_mus.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_EXO_WM_HELPER_MUS_H_
 #define COMPONENTS_EXO_WM_HELPER_MUS_H_
 
 #include "base/macros.h"
 #include "components/exo/wm_helper.h"
 #include "ui/aura/client/focus_change_observer.h"
@@ skipping 12 matching lines @@
 // This is only used for mash. Mushrome uses WMHelperAsh.
 class WMHelperMus : public WMHelper,
                     public ui::InputDeviceEventObserver,
                     public aura::FocusSynchronizerObserver,
                     public aura::client::FocusChangeObserver {
  public:
   WMHelperMus();
   ~WMHelperMus() 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;
   void AddPostTargetHandler(ui::EventHandler* handler) override;
   void RemovePostTargetHandler(ui::EventHandler* handler) override;
   bool IsMaximizeModeWindowManagerEnabled() const override;
 
   // Overridden from aura::FocusSynchronizerObserver:
   void OnActiveFocusClientChanged(aura::client::FocusClient* focus_client,
                                   aura::Window* focus_client_root) override;
@@ skipping 19 matching lines @@
   aura::Window* root_with_active_focus_client_ = nullptr;
   aura::Window* active_window_ = nullptr;
   aura::Window* focused_window_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(WMHelperMus);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_WM_HELPER_H_