Rename gfx::Display/Screen to display::Display/Screen in ash

ash/wm/common/window_resizer.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 "ash/wm/common/window_resizer.h"
 
 #include "ash/wm/common/dock/docked_window_layout_manager.h"
 #include "ash/wm/common/root_window_finder.h"
 #include "ash/wm/common/window_positioning_utils.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 
 namespace ash {
 
 namespace {
 
 // Returns true for resize components along the right edge, where a drag in
 // positive x will make the window larger.
 bool IsRightEdge(int window_component) {
   return window_component == HTTOPRIGHT || window_component == HTRIGHT ||
          window_component == HTBOTTOMRIGHT || window_component == HTGROWBOX;
@@ skipping 157 matching lines @@
 
     // Make sure that |new_bounds| doesn't leave any of the displays.  Note that
     // the |work_area| above isn't good for this check since it is the work area
     // for the current display but the window can move to a different one.
     wm::WmWindow* parent = GetTarget()->GetParent();
     gfx::Point passed_location_in_screen(
         parent->ConvertPointToScreen(passed_location));
     gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size());
     // Use a pointer location (matching the logic in DragWindowResizer) to
     // calculate the target display after the drag.
-    const gfx::Display& display =
-        gfx::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
+    const display::Display& display =
+        display::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
     DockedWindowLayoutManager* dock_layout = DockedWindowLayoutManager::Get(
         wm::GetRootWindowMatching(near_passed_location));
 
     gfx::Rect screen_work_area = display.work_area();
     screen_work_area.Union(dock_layout->docked_bounds());
     screen_work_area.Inset(wm::kMinimumOnScreenArea, 0);
     gfx::Rect new_bounds_in_screen = parent->ConvertRectToScreen(new_bounds);
     if (!screen_work_area.Intersects(new_bounds_in_screen)) {
       // Make sure that the x origin does not leave the current display.
       new_bounds_in_screen.set_x(std::max(
@@ skipping 114 matching lines @@
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier *
                  (details().initial_bounds_in_parent.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace ash