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

ash/wm/lock_window_state.cc

 // 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.
 
 #include "ash/wm/lock_window_state.h"
 
 #include <utility>
 
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
@@ skipping 157 matching lines @@
 
 wm::WindowStateType LockWindowState::GetMaximizedOrCenteredWindowType(
       wm::WindowState* window_state) {
   return window_state->CanMaximize() ? wm::WINDOW_STATE_TYPE_MAXIMIZED :
                                        wm::WINDOW_STATE_TYPE_NORMAL;
 }
 
 gfx::Rect GetBoundsForLockWindow(aura::Window* window) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (display_manager->IsInUnifiedMode()) {
-    const gfx::Display& first =
+    const display::Display& first =
         display_manager->software_mirroring_display_list()[0];
     return first.bounds();
   } else {
     return ScreenUtil::GetDisplayBoundsInParent(window);
   }
 }
 
 void LockWindowState::UpdateBounds(wm::WindowState* window_state) {
   if (!window_state->IsMaximized() && !window_state->IsFullscreen())
     return;
@@ skipping 10 matching lines @@
   gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInRoot(
       ash::wm::WmWindowAura::GetAuraWindow(window_state->window()));
 
   bounds.set_height(bounds.height() - keyboard_bounds.height());
 
   VLOG(1) << "Updating window bounds to: " << bounds.ToString();
   window_state->SetBoundsDirect(bounds);
 }
 
 }  // namespace ash