[M60] exo: Fix multi-display hardware cursor

components/exo/wm_helper_ash.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_ash.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ skipping 33 matching lines @@
   if (ash::ShellPort::Get()->GetAshConfig() != ash::Config::MUS)
     ash::Shell::Get()->cursor_manager()->RemoveObserver(this);
   ash::Shell::Get()->activation_client()->RemoveObserver(this);
   ash::Shell::Get()->RemoveShellObserver(this);
   ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperAsh, private:
 
-const display::ManagedDisplayInfo WMHelperAsh::GetDisplayInfo(
+const display::ManagedDisplayInfo& WMHelperAsh::GetDisplayInfo(
     int64_t display_id) const {
   return ash::Shell::Get()->display_manager()->GetDisplayInfo(display_id);
 }
 
-aura::Window* WMHelperAsh::GetContainer(int container_id) {
-  // TODO(domlaskowski): Use target root window once multi-display support lands
-  // in ARC. See crbug.com/718627.
+aura::Window* WMHelperAsh::GetPrimaryDisplayContainer(int container_id) {
   return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
                                   container_id);
 }
 
 aura::Window* WMHelperAsh::GetActiveWindow() const {
   return ash::Shell::Get()->activation_client()->GetActiveWindow();
 }
 
 aura::Window* WMHelperAsh::GetFocusedWindow() const {
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
   return focus_client->GetFocusedWindow();
 }
 
 ui::CursorSetType WMHelperAsh::GetCursorSet() const {
   // TODO(crbug.com/631103): Mushrome doesn't have a cursor manager yet.
   if (ash::ShellPort::Get()->GetAshConfig() == ash::Config::MUS)
     return ui::CURSOR_SET_NORMAL;
   return ash::Shell::Get()->cursor_manager()->GetCursorSet();
 }
 
+const display::Display& WMHelperAsh::GetCursorDisplay() const {
+  // TODO(crbug.com/631103): Mushrome doesn't have a cursor manager yet.
+  if (ash::ShellPort::Get()->GetAshConfig() == ash::Config::MUS) {
+    static const display::Display display;
+    return display;
+  }
+  return ash::Shell::Get()->cursor_manager()->GetDisplay();
+}
+
 void WMHelperAsh::AddPreTargetHandler(ui::EventHandler* handler) {
   ash::Shell::Get()->AddPreTargetHandler(handler);
 }
 
 void WMHelperAsh::PrependPreTargetHandler(ui::EventHandler* handler) {
   ash::Shell::Get()->PrependPreTargetHandler(handler);
 }
 
 void WMHelperAsh::RemovePreTargetHandler(ui::EventHandler* handler) {
   ash::Shell::Get()->RemovePreTargetHandler(handler);
@@ skipping 26 matching lines @@
 }
 
 void WMHelperAsh::OnCursorVisibilityChanged(bool is_visible) {
   NotifyCursorVisibilityChanged(is_visible);
 }
 
 void WMHelperAsh::OnCursorSetChanged(ui::CursorSetType cursor_set) {
   NotifyCursorSetChanged(cursor_set);
 }
 
+void WMHelperAsh::OnCursorDisplayChanged(const display::Display& display) {
+  NotifyCursorDisplayChanged(display);
+}
+
 void WMHelperAsh::OnMaximizeModeStarted() {
   NotifyMaximizeModeStarted();
 }
 
 void WMHelperAsh::OnMaximizeModeEnding() {
   NotifyMaximizeModeEnding();
 }
 
 void WMHelperAsh::OnMaximizeModeEnded() {
   NotifyMaximizeModeEnded();
 }
 
 void WMHelperAsh::OnDisplayConfigurationChanged() {
   NotifyDisplayConfigurationChanged();
 }
 
 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() {
   NotifyKeyboardDeviceConfigurationChanged();
 }
 
 }  // namespace exo