Rename gfx::Display/Screen to display::Display/Screen in views mac

ui/views/event_monitor_mac.mm

 // Copyright 2014 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.
 
 #import "ui/views/event_monitor_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_utils.h"
-#include "ui/gfx/screen.h"
 
 namespace views {
 
 // static
 std::unique_ptr<EventMonitor> EventMonitor::CreateApplicationMonitor(
     ui::EventHandler* event_handler) {
   return base::WrapUnique(new EventMonitorMac(event_handler, nullptr));
 }
 
 // static
 std::unique_ptr<EventMonitor> EventMonitor::CreateWindowMonitor(
     ui::EventHandler* event_handler,
     gfx::NativeWindow target_window) {
   return base::WrapUnique(new EventMonitorMac(event_handler, target_window));
 }
 
 // static
 gfx::Point EventMonitor::GetLastMouseLocation() {
-  return gfx::Screen::GetScreen()->GetCursorScreenPoint();
+  return display::Screen::GetScreen()->GetCursorScreenPoint();
 }
 
 EventMonitorMac::EventMonitorMac(ui::EventHandler* event_handler,
                                  gfx::NativeWindow target_window) {
   DCHECK(event_handler);
   monitor_ = [NSEvent addLocalMonitorForEventsMatchingMask:NSAnyEventMask
       handler:^NSEvent*(NSEvent* event) {
           if (!target_window || [event window] == target_window) {
             std::unique_ptr<ui::Event> ui_event = ui::EventFromNative(event);
             if (ui_event)
               event_handler->OnEvent(ui_event.get());
           }
           return event;
       }];
 }
 
 EventMonitorMac::~EventMonitorMac() {
   [NSEvent removeMonitor:monitor_];
 }
 
 }  // namespace views