Rename gfx::Display/Screen to display::Display/Screen in chrome/content/extensions mac

chrome/browser/ui/app_list/app_list_service_mac.mm

Index: chrome/browser/ui/app_list/app_list_service_mac.mm
diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
index 096c9ff1bbe481bda6406b81a3eca2485d952a7d..386b3b31a9248b159387eafb256eb0e9221b5970 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
@@ -49,8 +49,8 @@
 #include "ui/app_list/search_box_model.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 namespace gfx {
 class ImageSkia;
@@ -179,7 +179,7 @@ NSRunningApplication* ActiveApplicationNotChrome() {
 
 // Determines which screen edge the dock is aligned to.
 AppListPositioner::ScreenEdge DockLocationInDisplay(
-    const gfx::Display& display) {
+    const display::Display& display) {
   // Assume the dock occupies part of the work area either on the left, right or
   // bottom of the display. Note in the autohide case, it is always 4 pixels.
   const gfx::Rect work_area = display.work_area();
@@ -199,7 +199,7 @@ AppListPositioner::ScreenEdge DockLocationInDisplay(
 // If |display|'s work area is too close to its boundary on |dock_edge|, adjust
 // the work area away from the edge by a constant amount to reduce overlap and
 // ensure the dock icon can still be clicked to dismiss the app list.
-void AdjustWorkAreaForDock(const gfx::Display& display,
+void AdjustWorkAreaForDock(const display::Display& display,
                            AppListPositioner* positioner,
                            AppListPositioner::ScreenEdge dock_edge) {
   const int kAutohideDockThreshold = 10;
@@ -232,10 +232,10 @@ void AdjustWorkAreaForDock(const gfx::Display& display,
 
 void GetAppListWindowOrigins(
     NSWindow* window, NSPoint* target_origin, NSPoint* start_origin) {
-  gfx::Screen* const screen = gfx::Screen::GetScreen();
+  display::Screen* const screen = display::Screen::GetScreen();
   // Ensure y coordinates are flipped back into AppKit's coordinate system.
   bool cursor_is_visible = CGCursorIsVisible();
-  gfx::Display display;
+  display::Display display;
   gfx::Point cursor;
   if (!cursor_is_visible) {
     // If Chrome is the active application, display on the same display as
@@ -287,7 +287,7 @@ AppListServiceMac::~AppListServiceMac() {}
 
 // static
 void AppListServiceMac::FindAnchorPoint(const gfx::Size& window_size,
-                                        const gfx::Display& display,
+                                        const display::Display& display,
                                         int primary_display_height,
                                         bool cursor_is_visible,
                                         const gfx::Point& cursor,