exo: Fix multi-display hardware cursor

components/exo/wm_helper_mus.cc

Index: components/exo/wm_helper_mus.cc
diff --git a/components/exo/wm_helper_mus.cc b/components/exo/wm_helper_mus.cc
index 105691c8c44cfd5e09e00ceeb087e1ddcc0fdbf2..89543f3f908ca15af40c27dcbbce893add6d6a3f 100644
--- a/components/exo/wm_helper_mus.cc
+++ b/components/exo/wm_helper_mus.cc
@@ -9,6 +9,7 @@
 #include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
+#include "ui/display/display.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/wm/public/activation_client.h"
@@ -37,13 +38,14 @@ WMHelperMus::~WMHelperMus() {
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperMus, private:
 
-const display::ManagedDisplayInfo WMHelperMus::GetDisplayInfo(
+const display::ManagedDisplayInfo& WMHelperMus::GetDisplayInfo(
     int64_t display_id) const {
   // TODO(penghuang): Return real display info when it is supported in mus.
-  return display::ManagedDisplayInfo(display_id, "", false);
+  static const display::ManagedDisplayInfo info;
+  return info;
 }
 
-aura::Window* WMHelperMus::GetContainer(int container_id) {
+aura::Window* WMHelperMus::GetPrimaryDisplayContainer(int container_id) {
   NOTIMPLEMENTED();
   return nullptr;
 }
@@ -61,6 +63,13 @@ ui::CursorSetType WMHelperMus::GetCursorSet() const {
   return ui::CursorSetType::CURSOR_SET_NORMAL;
 }
 
+const display::Display& WMHelperMus::GetCursorDisplay() const {
+  NOTIMPLEMENTED();
+  // TODO(penghuang): Return real display when supported in mus.
+  static const display::Display display;
+  return display;
+}
+
 void WMHelperMus::AddPreTargetHandler(ui::EventHandler* handler) {
   aura::Env::GetInstance()->AddPreTargetHandler(handler);
 }