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

ash/system/chromeos/rotation/tray_rotation_lock.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/system/chromeos/rotation/tray_rotation_lock.h"
 
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace ash {
 
 namespace tray {
 
 // Extends TrayItemMore, however does not make use of the chevron, nor of the
 // DetailedView. This was chosen over ActionableView in order to reuse the
 // layout and styling of labels and images. This allows RotationLockDefaultView
 // to maintain the look of other system tray items without code duplication.
 class RotationLockDefaultView : public TrayItemMore,
@@ skipping 115 matching lines @@
          Shell::GetInstance()
              ->maximize_mode_controller()
              ->IsMaximizeModeWindowManagerEnabled() &&
          Shell::GetInstance()
              ->screen_orientation_controller()
              ->rotation_locked();
 }
 
 bool TrayRotationLock::OnPrimaryDisplay() const {
   gfx::NativeView native_view = system_tray()->GetWidget()->GetNativeView();
-  gfx::Display parent_display =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(native_view);
+  display::Display parent_display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(native_view);
   return parent_display.IsInternal();
 }
 
 void TrayRotationLock::StopObservingRotation() {
   if (!observing_rotation_)
     return;
   ScreenOrientationController* controller =
       Shell::GetInstance()->screen_orientation_controller();
   if (controller)
     controller->RemoveObserver(this);
   observing_rotation_ = false;
 }
 
 void TrayRotationLock::StopObservingShell() {
   if (!observing_shell_)
     return;
   Shell::GetInstance()->RemoveShellObserver(this);
   observing_shell_ = false;
 }
 
 }  // namespace ash