Rename the remaining usage of Monitor to Display

ash/display/mouse_cursor_event_filter.cc

Index: ash/display/mouse_cursor_event_filter.cc
diff --git a/ash/monitor/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc
similarity index 83%
rename from ash/monitor/mouse_cursor_event_filter.cc
rename to ash/display/mouse_cursor_event_filter.cc
index 0c451d1744c1d718dd4e09f3149d11c246e39fa8..0ab6f1cff0e09c1580095415b8ae1cf8c11c2050 100644
--- a/ash/monitor/mouse_cursor_event_filter.cc
+++ b/ash/display/mouse_cursor_event_filter.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/monitor/mouse_cursor_event_filter.h"
+#include "ash/display/mouse_cursor_event_filter.h"
 
-#include "ash/monitor/monitor_controller.h"
+#include "ash/display/display_controller.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
@@ -13,9 +13,9 @@ namespace ash {
 namespace internal {
 
 MouseCursorEventFilter::MouseCursorEventFilter(
-    MonitorController* monitor_controller)
-    : monitor_controller_(monitor_controller) {
-  DCHECK(monitor_controller_);
+    DisplayController* display_controller)
+    : display_controller_(display_controller) {
+  DCHECK(display_controller_);
 }
 
 MouseCursorEventFilter::~MouseCursorEventFilter() {
@@ -33,7 +33,7 @@ bool MouseCursorEventFilter::PreHandleMouseEvent(aura::Window* target,
   aura::RootWindow* current_root = target->GetRootWindow();
   gfx::Point location_in_root(event->location());
   aura::Window::ConvertPointToWindow(target, current_root, &location_in_root);
-  return monitor_controller_->WarpMouseCursorIfNecessary(
+  return display_controller_->WarpMouseCursorIfNecessary(
       current_root, location_in_root);
 }