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/common/accessibility_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
+#include "ash/wm/ash_native_cursor_manager.h"
 #include "base/memory/singleton.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace exo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperAsh, public:
 
 WMHelperAsh::WMHelperAsh() {
   ash::Shell::GetInstance()->AddShellObserver(this);
   ash::Shell::GetInstance()->activation_client()->AddObserver(this);
   ash::Shell::GetInstance()->cursor_manager()->AddObserver(this);
+  ash::Shell::GetInstance()->native_cursor_manager()->AddObserver(this);
   ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
   focus_client->AddObserver(this);
   ui::DeviceDataManager::GetInstance()->AddObserver(this);
   ash::Shell::Get()->system_tray_notifier()->AddAccessibilityObserver(this);
 }
 
 WMHelperAsh::~WMHelperAsh() {
   if (!ash::Shell::HasInstance())
     return;
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
   focus_client->RemoveObserver(this);
   ash::Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
+  ash::Shell::GetInstance()->native_cursor_manager()->RemoveObserver(this);
   ash::Shell::GetInstance()->cursor_manager()->RemoveObserver(this);
   ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
   ash::Shell::GetInstance()->RemoveShellObserver(this);
   ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
   ash::Shell::Get()->system_tray_notifier()->RemoveAccessibilityObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperAsh, private:
 
 const display::ManagedDisplayInfo WMHelperAsh::GetDisplayInfo(
     int64_t display_id) const {
   return ash::Shell::GetInstance()->display_manager()->GetDisplayInfo(
       display_id);
 }
 
-aura::Window* WMHelperAsh::GetContainer(int container_id) {
-  return ash::Shell::GetContainer(ash::Shell::GetRootWindowForNewWindows(),
-                                  container_id);
+aura::Window* WMHelperAsh::GetContainer(int64_t display_id, int container_id) {
+  ash::RootWindowController* controller =
+      ash::Shell::GetRootWindowControllerWithDisplayId(display_id);
+  return ash::Shell::GetContainer(
+      controller ? controller->GetRootWindow()
+                 : ash::Shell::GetRootWindowForNewWindows(),
+      container_id);
 }
 
 aura::Window* WMHelperAsh::GetActiveWindow() const {
   return ash::Shell::GetInstance()->activation_client()->GetActiveWindow();
 }
 
 aura::Window* WMHelperAsh::GetFocusedWindow() const {
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
   return focus_client->GetFocusedWindow();
@@ skipping 33 matching lines @@
   return ash::Shell::GetInstance()
       ->accessibility_delegate()
       ->IsSpokenFeedbackEnabled();
 }
 
 void WMHelperAsh::PlayEarcon(int sound_key) const {
   return ash::Shell::GetInstance()->accessibility_delegate()->PlayEarcon(
       sound_key);
 }
 
+void WMHelperAsh::SetCursor(gfx::NativeCursor cursor) {
+  ash::Shell* shell = ash::Shell::GetInstance();
+  static_cast<wm::NativeCursorManager*>(shell->native_cursor_manager())
+      ->SetCursor(cursor, shell->cursor_manager());
+}
+
 void WMHelperAsh::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   NotifyWindowActivated(gained_active, lost_active);
 }
 
 void WMHelperAsh::OnWindowFocused(aura::Window* gained_focus,
                                   aura::Window* lost_focus) {
   NotifyWindowFocused(gained_focus, lost_focus);
 }
 
 void WMHelperAsh::OnCursorVisibilityChanged(bool is_visible) {
   NotifyCursorVisibilityChanged(is_visible);
 }
 
 void WMHelperAsh::OnCursorSetChanged(ui::CursorSetType cursor_set) {
   NotifyCursorSetChanged(cursor_set);
 }
 
+void WMHelperAsh::OnCursorDisplayChanging(const display::Display& display) {
+  NotifyCursorDisplayChanging(display);
+}
+
 void WMHelperAsh::OnAccessibilityModeChanged(
     ash::AccessibilityNotificationVisibility notify) {
   NotifyAccessibilityModeChanged();
 }
 
 void WMHelperAsh::OnMaximizeModeStarted() {
   NotifyMaximizeModeStarted();
 }
 
 void WMHelperAsh::OnMaximizeModeEnding() {
   NotifyMaximizeModeEnding();
 }
 
 void WMHelperAsh::OnMaximizeModeEnded() {
   NotifyMaximizeModeEnded();
 }
 
 void WMHelperAsh::OnDisplayConfigurationChanged() {
   NotifyDisplayConfigurationChanged();
 }
 
 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() {
   NotifyKeyboardDeviceConfigurationChanged();
 }
 
 }  // namespace exo