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/accessibility_delegate.h"
 #include "ash/public/cpp/config.h"
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_notifier.h"
+#include "ash/wm/ash_native_cursor_manager.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm_shell.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::Get()->AddShellObserver(this);
   ash::Shell::Get()->activation_client()->AddObserver(this);
   // TODO(crbug.com/631103): Mushrome doesn't have a cursor manager yet.
-  if (ash::WmShell::Get()->GetAshConfig() != ash::Config::MUS)
+  if (ash::WmShell::Get()->GetAshConfig() != ash::Config::MUS) {
     ash::Shell::Get()->cursor_manager()->AddObserver(this);
+    ash::Shell::Get()->native_cursor_manager()->AddObserver(this);
+  }
   ash::WmShell::Get()->AddDisplayObserver(this);
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
   focus_client->AddObserver(this);
   // TODO(crbug.com/709225): Mushrome doesn't have a DeviceDataManager.
   if (ash::WmShell::Get()->GetAshConfig() != ash::Config::MUS)
     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::WmShell::Get()->RemoveDisplayObserver(this);
   // TODO(crbug.com/631103): Mushrome doesn't have a cursor manager yet.
-  if (ash::WmShell::Get()->GetAshConfig() != ash::Config::MUS)
+  if (ash::WmShell::Get()->GetAshConfig() != ash::Config::MUS) {
     ash::Shell::Get()->cursor_manager()->RemoveObserver(this);
+    ash::Shell::Get()->native_cursor_manager()->RemoveObserver(this);
+  }
   ash::Shell::Get()->activation_client()->RemoveObserver(this);
   ash::Shell::Get()->RemoveShellObserver(this);
   // TODO(crbug.com/709225): Mushrome doesn't have a DeviceDataManager.
   if (ash::WmShell::Get()->GetAshConfig() != ash::Config::MUS)
     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::Get()->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()

[reveman, 2017/04/10 21:47:13]

when is controller null?

[Dominik Laskowski, 2017/04/11 04:42:55]

When a display with |display_id| does not exist.

[reveman, 2017/04/11 19:25:13]

and why does it need to be valid behavior to call this function with an invalid
display id?

[Dominik Laskowski, 2017/04/11 20:40:37]

To retain the old behavior as an option, but YAGNI. Changed to return null if
either |display_id| or |container_id| is invalid.

+                 : ash::Shell::GetRootWindowForNewWindows(),
+      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();
@@ skipping 53 matching lines @@
 }
 
 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