Rename gfx::Monitor to gfx::Display

ui/base/x/events_x.cc

 // Copyright (c) 2012 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 "ui/base/events.h"
 
-#include <X11/Xlib.h>
+#include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
-#include <string.h>
+#include <X11/Xlib.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_pump_aurax11.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
+#include "ui/base/touch/touch_factory.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/base/touch/touch_factory.h"
 #include "ui/base/x/valuators.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
-#include "ui/gfx/monitor.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 
 // Copied from xserver-properties.h
 #define AXIS_LABEL_PROP_REL_HWHEEL "Rel Horiz Wheel"
 #define AXIS_LABEL_PROP_REL_WHEEL "Rel Vert Wheel"
 
 // CMT specific timings
 #define AXIS_LABEL_PROP_ABS_START_TIME "Abs Start Timestamp"
 #define AXIS_LABEL_PROP_ABS_END_TIME "Abs End Timestamp"
@@ skipping 947 matching lines @@
     noop->xclient.format = 8;
     DCHECK(!noop->xclient.display);
   }
   // Make sure we use atom from current xdisplay, which may
   // change during the test.
   noop->xclient.message_type = GetNoopEventAtom();
   return noop;
 }
 
 }  // namespace ui