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

ash/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <utility>
@@ skipping 51 matching lines @@
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/env.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
+#include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/gfx/screen.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/display_configuration_controller.h"
 #include "ash/system/chromeos/keyboard_brightness_controller.h"
 #include "base/sys_info.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
@@ skipping 267 matching lines @@
   if (accelerator.type() == ui::ET_KEY_PRESSED)
     ime_control_delegate->HandlePreviousIme();
   // Else: consume the Ctrl+Space ET_KEY_RELEASED event but do not do anything.
 }
 
 void HandleRestoreTab() {
   base::RecordAction(base::UserMetricsAction("Accel_Restore_Tab"));
   Shell::GetInstance()->new_window_delegate()->RestoreTab();
 }
 
-gfx::Display::Rotation GetNextRotation(gfx::Display::Rotation current) {
+display::Display::Rotation GetNextRotation(display::Display::Rotation current) {
   switch (current) {
-    case gfx::Display::ROTATE_0:
-      return gfx::Display::ROTATE_90;
-    case gfx::Display::ROTATE_90:
-      return gfx::Display::ROTATE_180;
-    case gfx::Display::ROTATE_180:
-      return gfx::Display::ROTATE_270;
-    case gfx::Display::ROTATE_270:
-      return gfx::Display::ROTATE_0;
+    case display::Display::ROTATE_0:
+      return display::Display::ROTATE_90;
+    case display::Display::ROTATE_90:
+      return display::Display::ROTATE_180;
+    case display::Display::ROTATE_180:
+      return display::Display::ROTATE_270;
+    case display::Display::ROTATE_270:
+      return display::Display::ROTATE_0;
   }
   NOTREACHED() << "Unknown rotation:" << current;
-  return gfx::Display::ROTATE_0;
+  return display::Display::ROTATE_0;
 }
 
 // Rotates the screen.
 void HandleRotateScreen() {
   if (Shell::GetInstance()->display_manager()->IsInUnifiedMode())
     return;
 
   base::RecordAction(UserMetricsAction("Accel_Rotate_Window"));
-  gfx::Point point = gfx::Screen::GetScreen()->GetCursorScreenPoint();
-  gfx::Display display =
-      gfx::Screen::GetScreen()->GetDisplayNearestPoint(point);
+  gfx::Point point = display::Screen::GetScreen()->GetCursorScreenPoint();
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestPoint(point);
   const DisplayInfo& display_info =
       Shell::GetInstance()->display_manager()->GetDisplayInfo(display.id());
   ash::ScreenRotationAnimator(display.id())
       .Rotate(GetNextRotation(display_info.GetActiveRotation()),
-              gfx::Display::ROTATION_SOURCE_USER);
+              display::Display::ROTATION_SOURCE_USER);
 }
 
 // Rotate the active window.
 void HandleRotateActiveWindow() {
   base::RecordAction(UserMetricsAction("Accel_Rotate_Window"));
   aura::Window* active_window = wm::GetActiveWindow();
   if (active_window) {
     // The rotation animation bases its target transform on the current
     // rotation and position. Since there could be an animation in progress
     // right now, queue this animation so when it starts it picks up a neutral
@@ skipping 652 matching lines @@
     case SWITCH_TO_NEXT_USER:
       return CanHandleCycleUser();
     case TOGGLE_CAPS_LOCK:
       return CanHandleToggleCapsLock(accelerator, previous_accelerator);
     case TOGGLE_TOUCH_VIEW_TESTING:
       return CanHandleToggleTouchViewTesting();
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
       return CanHandleTouchHud();
     case SWAP_PRIMARY_DISPLAY:
-      return gfx::Screen::GetScreen()->GetNumDisplays() > 1;
+      return display::Screen::GetScreen()->GetNumDisplays() > 1;
 #endif
     case CYCLE_BACKWARD_MRU:
     case CYCLE_FORWARD_MRU:
     case EXIT:
     case FOCUS_NEXT_PANE:
     case FOCUS_PREVIOUS_PANE:
     case FOCUS_SHELF:
     case LAUNCH_APP_0:
     case LAUNCH_APP_1:
     case LAUNCH_APP_2:
@@ skipping 369 matching lines @@
 }
 
 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
     std::unique_ptr<KeyboardBrightnessControlDelegate>
         keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       std::move(keyboard_brightness_control_delegate);
 }
 
 }  // namespace ash