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

chrome/browser/ui/app_list/app_list_service_mac.mm

 // Copyright 2013 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 "chrome/browser/ui/app_list/app_list_service_mac.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
@@ skipping 31 matching lines @@
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/manifest_handlers/file_handler_info.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "net/base/url_util.h"
 #include "ui/app_list/app_list_switches.h"
 #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;
 }
 
 // Controller for animations that show or hide the app list.
 @interface AppListAnimationController : NSObject<NSAnimationDelegate> {
  @private
   // When closing, the window to close. Retained until the animation ends.
   base::scoped_nsobject<NSWindow> window_;
@@ skipping 108 matching lines @@
       return nil;  // Chrome is active.
 
     return application;
   }
 
   return nil;
 }
 
 // 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();
   const gfx::Rect display_bounds = display.bounds();
   if (work_area.bottom() != display_bounds.bottom())
     return AppListPositioner::SCREEN_EDGE_BOTTOM;
 
   if (work_area.x() != display_bounds.x())
     return AppListPositioner::SCREEN_EDGE_LEFT;
 
   if (work_area.right() != display_bounds.right())
     return AppListPositioner::SCREEN_EDGE_RIGHT;
 
   return AppListPositioner::SCREEN_EDGE_UNKNOWN;
 }
 
 // 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;
   const int kExtraDistance = 50;  // A dock with 40 items is about this size.
 
   const gfx::Rect work_area = display.work_area();
   const gfx::Rect display_bounds = display.bounds();
 
   switch (dock_edge) {
     case AppListPositioner::SCREEN_EDGE_LEFT:
@@ skipping 12 matching lines @@
       break;
     case AppListPositioner::SCREEN_EDGE_UNKNOWN:
     case AppListPositioner::SCREEN_EDGE_TOP:
       NOTREACHED();
       break;
   }
 }
 
 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
     // Chrome's keyWindow since this will catch activations triggered, e.g, via
     // WebStore install. If another application is active, OSX doesn't provide a
     // reliable way to get the display in use. Fall back to the primary display
     // since it has the menu bar and is likely to be correct, e.g., for
     // activations from Spotlight.
     const gfx::NativeView key_view = [[NSApp keyWindow] contentView];
     display = key_view && [NSApp isActive] ?
@@ skipping 31 matching lines @@
 }  // namespace
 
 AppListServiceMac::AppListServiceMac() {
   animation_controller_.reset([[AppListAnimationController alloc] init]);
 }
 
 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,
                                         NSPoint* target_origin,
                                         NSPoint* start_origin) {
   AppListPositioner positioner(display, window_size, 0);
   AppListPositioner::ScreenEdge dock_location = DockLocationInDisplay(display);
 
   gfx::Point anchor;
   // Snap to the dock edge. If the cursor is greater than the window
@@ skipping 282 matching lines @@
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&AppListServiceMac::WindowAnimationDidEnd,
                  base::Unretained(GetActiveInstance())));
 }
 
 @end