Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.

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 <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
@@ skipping 563 matching lines @@
   int y = static_cast<int>(xievent->event_y);
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kEnableTouchCalibration))
     return gfx::Point(x, y);
   // TODO(skuhne): Find a new home for these hardware dependent touch
   // constants.
   // Note: These values have been found to be correct for the device I was
   // testing with. I have the feeling that the DPI resolution of the bezel is
   // less then the dpi resolution over the visible part - which would explain
   // why the small value (50) is so wide compared to the entire area.
-  gfx::Rect bounds = gfx::Screen::GetPrimaryMonitor().bounds_in_pixel();
+  gfx::Rect bounds = gfx::Screen::GetPrimaryDisplay().bounds_in_pixel();
   const int kLeftBorder = 50;
   const int kRightBorder = 50;
   const int kBottomBorder = 50;
   const int kTopBorder = 0;
   const int resolution_x = bounds.width();
   const int resolution_y = bounds.height();
   // The "grace area" (10% in this case) is to make it easier for the user to
   // navigate to the corner.
   const double kGraceAreaFraction = 0.1;
   // Offset the x position to the real
@@ skipping 384 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