[M60] exo: Fix multi-display hardware cursor

components/exo/wm_helper_mus.cc

 // 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.
 
 #include "components/exo/wm_helper_mus.h"
 
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #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"
 namespace exo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperMus, public:
 
 WMHelperMus::WMHelperMus() {
   aura::FocusSynchronizer* focus_synchronizer =
       views::MusClient::Get()->window_tree_client()->focus_synchronizer();
   SetActiveFocusClient(focus_synchronizer->active_focus_client(),
                        focus_synchronizer->active_focus_client_root());
   focus_synchronizer->AddObserver(this);
 }
 
 WMHelperMus::~WMHelperMus() {
   if (active_focus_client_)
     active_focus_client_->RemoveObserver(this);
   views::MusClient::Get()
       ->window_tree_client()
       ->focus_synchronizer()
       ->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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;
 }
 
 aura::Window* WMHelperMus::GetActiveWindow() const {
   return active_window_;
 }
 
 aura::Window* WMHelperMus::GetFocusedWindow() const {
   return focused_window_;
 }
 
 ui::CursorSetType WMHelperMus::GetCursorSet() const {
   NOTIMPLEMENTED();
   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);
 }
 
 void WMHelperMus::PrependPreTargetHandler(ui::EventHandler* handler) {
   aura::Env::GetInstance()->PrependPreTargetHandler(handler);
 }
 
 void WMHelperMus::RemovePreTargetHandler(ui::EventHandler* handler) {
   aura::Env::GetInstance()->RemovePreTargetHandler(handler);
@@ skipping 65 matching lines @@
   NotifyWindowFocused(focused_window_, lost_focus);
 }
 
 aura::client::ActivationClient* WMHelperMus::GetActivationClient() {
   return root_with_active_focus_client_
              ? aura::client::GetActivationClient(root_with_active_focus_client_)
              : nullptr;
 }
 
 }  // namespace exo