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

ash/wm/maximize_mode/maximize_mode_window_manager.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_window_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_event.h"
 #include "ash/wm/maximize_mode/maximize_mode_window_state.h"
 #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 namespace ash {
 
 namespace {
 
 // The height of the area in which a touch operation leads to exiting the
 // full screen mode.
 const int kLeaveFullScreenAreaHeightInPixel = 2;
 
 // Exits overview mode if it is currently active.
 void CancelOverview() {
   WindowSelectorController* controller =
       Shell::GetInstance()->window_selector_controller();
   if (controller && controller->IsSelecting())
     controller->OnSelectionEnded();
 }
 
 }  // namespace
 
 MaximizeModeWindowManager::~MaximizeModeWindowManager() {
   // Overview mode needs to be ended before exiting maximize mode to prevent
   // transforming windows which are currently in
   // overview: http://crbug.com/366605
   CancelOverview();
 
   Shell::GetInstance()->RemovePreTargetHandler(this);
   Shell::GetInstance()->RemoveShellObserver(this);
-  gfx::Screen::GetScreen()->RemoveObserver(this);
+  display::Screen::GetScreen()->RemoveObserver(this);
   EnableBackdropBehindTopWindowOnEachDisplay(false);
   RemoveWindowCreationObservers();
   RestoreAllWindows();
 }
 
 int MaximizeModeWindowManager::GetNumberOfManagedWindows() {
   return window_state_map_.size();
 }
 
 void MaximizeModeWindowManager::AddWindow(aura::Window* window) {
@@ skipping 79 matching lines @@
   if (!IsContainerWindow(window))
     return;
   // Reposition all non maximizeable windows.
   for (WindowToState::iterator it = window_state_map_.begin();
        it != window_state_map_.end();
        ++it) {
     it->second->UpdateWindowPosition(wm::GetWindowState(it->first));
   }
 }
 
-void MaximizeModeWindowManager::OnDisplayAdded(const gfx::Display& display) {
+void MaximizeModeWindowManager::OnDisplayAdded(
+    const display::Display& display) {
   DisplayConfigurationChanged();
 }
 
-void MaximizeModeWindowManager::OnDisplayRemoved(const gfx::Display& display) {
+void MaximizeModeWindowManager::OnDisplayRemoved(
+    const display::Display& display) {
   DisplayConfigurationChanged();
 }
 
-void MaximizeModeWindowManager::OnDisplayMetricsChanged(const gfx::Display&,
+void MaximizeModeWindowManager::OnDisplayMetricsChanged(const display::Display&,
                                                         uint32_t) {
   // Nothing to do here.
 }
 
 void MaximizeModeWindowManager::OnTouchEvent(ui::TouchEvent* event) {
   if (event->type() != ui::ET_TOUCH_PRESSED)
     return;
 
   // Find the active window (from the primary screen) to un-fullscreen.
   aura::Window* window = wm::GetActiveWindow();
@@ skipping 19 matching lines @@
 
 MaximizeModeWindowManager::MaximizeModeWindowManager()
       : backdrops_hidden_(false) {
   // The overview mode needs to be ended before the maximize mode is started. To
   // guarantee the proper order, it will be turned off from here.
   CancelOverview();
 
   MaximizeAllWindows();
   AddWindowCreationObservers();
   EnableBackdropBehindTopWindowOnEachDisplay(true);
-  gfx::Screen::GetScreen()->AddObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
   Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
 void MaximizeModeWindowManager::MaximizeAllWindows() {
   MruWindowTracker::WindowList windows = ash::Shell::GetInstance()->
       mru_window_tracker()->BuildWindowListIgnoreModal();
   // Add all existing Mru windows.
   for (MruWindowTracker::WindowList::iterator window = windows.begin();
       window != windows.end(); ++window) {
@@ skipping 115 matching lines @@
     RootWindowController* controller = *iter;
     aura::Window* container = Shell::GetContainer(
         controller->GetRootWindow(), kShellWindowId_DefaultContainer);
     controller->workspace_controller()->SetMaximizeBackdropDelegate(
         std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate>(
             enable ? new WorkspaceBackdropDelegate(container) : NULL));
   }
 }
 
 }  // namespace ash