Make cursor highlighting feature work across multiple displays

chrome/browser/chromeos/accessibility/accessibility_highlight_manager.cc

 // Copyright (c) 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 "ash/shell.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_highlight_manager.h"
 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
 #include "content/public/browser/focused_node_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/cursor_manager.h"
 
 namespace chromeos {
 
 namespace {
 
 ui::InputMethod* GetInputMethod(aura::Window* root_window) {
   if (root_window->GetHost())
     return root_window->GetHost()->GetInputMethod();
   return nullptr;
@@ skipping 48 matching lines @@
   registrar_.Add(this, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
                  content::NotificationService::AllSources());
   aura::Window* root_window = ash::Shell::GetPrimaryRootWindow();
   ui::InputMethod* input_method = GetInputMethod(root_window);
   input_method->AddObserver(this);
   registered_observers_ = true;
 }
 
 void AccessibilityHighlightManager::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_MOVED) {
-    cursor_point_ = event->root_location();
+    cursor_point_ = event->location();
+    if (event->target()) {
+      ::wm::ConvertPointToScreen(static_cast<aura::Window*>(event->target()),
+                                 &cursor_point_);
+    }
     UpdateCursorHighlight();
   }
 }
 
 void AccessibilityHighlightManager::OnKeyEvent(ui::KeyEvent* event) {
   if (event->type() == ui::ET_KEY_PRESSED)
     UpdateFocusAndCaretHighlights();
 }
 
 void AccessibilityHighlightManager::Observe(
@@ skipping 60 matching lines @@
 void AccessibilityHighlightManager::UpdateCursorHighlight() {
   if (cursor_ && IsCursorVisible()) {
     AccessibilityFocusRingController::GetInstance()->SetCursorRing(
         cursor_point_);
   } else {
     AccessibilityFocusRingController::GetInstance()->HideCursorRing();
   }
 }
 
 }  // namespace chromeos