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

ash/wm/maximize_mode/maximize_mode_controller.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/maximize_mode/maximize_mode_controller.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "ui/base/accelerators/accelerator.h"
+#include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/vector3d_f.h"
 
 #if defined(USE_X11)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
 #endif
 
@@ skipping 149 matching lines @@
 
 #if defined(OS_CHROMEOS)
 void MaximizeModeController::OnAccelerometerUpdated(
     scoped_refptr<const chromeos::AccelerometerUpdate> update) {
   bool first_accelerometer_update = !have_seen_accelerometer_data_;
   have_seen_accelerometer_data_ = true;
 
   if (!update->has(chromeos::ACCELEROMETER_SOURCE_SCREEN))
     return;
 
-  if (!gfx::Display::HasInternalDisplay())
+  if (!display::Display::HasInternalDisplay())
     return;
 
   if (!Shell::GetInstance()->display_manager()->IsActiveDisplayId(
-          gfx::Display::InternalDisplayId())) {
+          display::Display::InternalDisplayId())) {
     return;
   }
 
   // Whether or not we enter maximize mode affects whether we handle screen
   // rotation, so determine whether to enter maximize mode first.
   if (!update->has(chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD)) {
     if (first_accelerometer_update)
       EnterMaximizeMode();
   } else if (ui::IsAccelerometerReadingStable(
                  *update, chromeos::ACCELEROMETER_SOURCE_SCREEN) &&
@@ skipping 134 matching lines @@
   RecordTouchViewUsageInterval(TOUCH_VIEW_INTERVAL_INACTIVE);
 }
 
 // Called after maximize mode has ended, windows might still be returning to
 // their original position.
 void MaximizeModeController::OnMaximizeModeEnded() {
   RecordTouchViewUsageInterval(TOUCH_VIEW_INTERVAL_ACTIVE);
 }
 
 void MaximizeModeController::OnDisplayConfigurationChanged() {
-  if (!gfx::Display::HasInternalDisplay() ||
+  if (!display::Display::HasInternalDisplay() ||
       !Shell::GetInstance()->display_manager()->IsActiveDisplayId(
-          gfx::Display::InternalDisplayId())) {
+          display::Display::InternalDisplayId())) {
     LeaveMaximizeMode();
   }
 }
 
 void MaximizeModeController::RecordTouchViewUsageInterval(
     TouchViewIntervalType type) {
   if (!CanEnterMaximizeMode())
     return;
 
   base::Time current_time = base::Time::Now();
@@ skipping 50 matching lines @@
   return elapsed_time.InSeconds() <= kLidRecentlyOpenedDurationSeconds;
 }
 
 void MaximizeModeController::SetTickClockForTest(
     std::unique_ptr<base::TickClock> tick_clock) {
   DCHECK(tick_clock_);
   tick_clock_ = std::move(tick_clock);
 }
 
 }  // namespace ash