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

ash/wm/window_positioner.cc

 // 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.
 
 #include "ash/wm/window_positioner.h"
 
 #include "ash/wm/common/window_positioning_utils.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_globals.h"
 #include "ash/wm/common/wm_screen_util.h"
 #include "ash/wm/common/wm_window.h"
 #include "ui/compositor/layer.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
-#include "ui/gfx/screen.h"
 
 namespace ash {
 
 const int WindowPositioner::kMinimumWindowOffset = 32;
 
 // The number of pixels which are kept free top, left and right when a window
 // gets positioned to its default location.
 // static
 const int WindowPositioner::kDesktopBorderSize = 16;
 
@@ skipping 354 matching lines @@
       pop_position_offset_increment_y(0),
       popup_position_offset_from_screen_corner_x(0),
       popup_position_offset_from_screen_corner_y(0),
       last_popup_position_x_(0),
       last_popup_position_y_(0) {}
 
 WindowPositioner::~WindowPositioner() {
 }
 
 gfx::Rect WindowPositioner::GetDefaultWindowBounds(
-    const gfx::Display& display) {
+    const display::Display& display) {
   const gfx::Rect work_area = display.work_area();
   // There should be a 'desktop' border around the window at the left and right
   // side.
   int default_width = work_area.width() - 2 * kDesktopBorderSize;
   // There should also be a 'desktop' border around the window at the top.
   // Since the workspace excludes the tray area we only need one border size.
   int default_height = work_area.height() - kDesktopBorderSize;
   int offset_x = kDesktopBorderSize;
   if (default_width > kMaximumWindowWidth) {
     // The window should get centered on the screen and not follow the grid.
@@ skipping 17 matching lines @@
     last_popup_position_y_ = popup_position_offset_from_screen_corner_y;
   }
   pop_position_offset_increment_x = grid;
   pop_position_offset_increment_y = grid;
   // We handle the Multi monitor support by retrieving the active window's
   // work area.
   wm::WmWindow* window = globals_->GetActiveWindow();
   const gfx::Rect work_area =
       window && window->IsVisible()
           ? window->GetDisplayNearestWindow().work_area()
-          : gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area();
+          : display::Screen::GetScreen()->GetPrimaryDisplay().work_area();
   // Only try to reposition the popup when it is not spanning the entire
   // screen.
   if ((old_pos.width() + popup_position_offset_from_screen_corner_x >=
       work_area.width()) ||
       (old_pos.height() + popup_position_offset_from_screen_corner_y >=
        work_area.height()))
     return AlignPopupPosition(old_pos, work_area, grid);
   const gfx::Rect result = SmartPopupPosition(old_pos, work_area, grid);
   if (!result.IsEmpty())
     return AlignPopupPosition(result, work_area, grid);
@@ skipping 121 matching lines @@
   // If the alignment was pushing the window out of the screen, we ignore the
   // alignment for that call.
   if (abs(pos.right() - work_area.right()) < grid)
     x = work_area.right() - w;
   if (abs(pos.bottom() - work_area.bottom()) < grid)
     y = work_area.bottom() - h;
   return gfx::Rect(x, y, w, h);
 }
 
 }  // namespace ash