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

ash/wm/maximize_mode/maximize_mode_window_manager.h

 // 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.
 
 #ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
 #define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/common/window_state.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
+#include "ui/display/display_observer.h"
 #include "ui/events/event_handler.h"
-#include "ui/gfx/display_observer.h"
 
 namespace ui {
 class TouchEvent;
 }
 
 namespace ash {
 class MaximizeModeController;
 class MaximizeModeWindowState;
 
 // A window manager which - when created - will force all windows into maximized
 // mode. Exception are panels and windows which cannot be maximized.
 // Windows which cannot be maximized / resized are centered with a layer placed
 // behind the window so that no other windows are visible and/or obscured.
 // With the destruction of the manager all windows will be restored to their
 // original state.
 class ASH_EXPORT MaximizeModeWindowManager : public aura::WindowObserver,
-                                             public gfx::DisplayObserver,
+                                             public display::DisplayObserver,
                                              public ShellObserver,
                                              public ui::EventHandler {
  public:
   // This should only be deleted by the creator (ash::Shell).
   ~MaximizeModeWindowManager() override;
 
   // Returns the number of maximized & tracked windows by this manager.
   int GetNumberOfManagedWindows();
 
   // Adds a window which needs to be maximized. This is used by other window
@@ skipping 12 matching lines @@
   // Overridden from WindowObserver:
   void OnWindowDestroying(aura::Window* window) override;
   void OnWindowAdded(aura::Window* window) override;
   void OnWindowPropertyChanged(aura::Window* window,
                                const void* key,
                                intptr_t old) override;
   void OnWindowBoundsChanged(aura::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
 
-  // gfx::DisplayObserver overrides:
-  void OnDisplayAdded(const gfx::Display& display) override;
-  void OnDisplayRemoved(const gfx::Display& display) override;
-  void OnDisplayMetricsChanged(const gfx::Display& display,
+  // display::DisplayObserver overrides:
+  void OnDisplayAdded(const display::Display& display) override;
+  void OnDisplayRemoved(const display::Display& display) override;
+  void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
   // ui::EventHandler override:
   void OnTouchEvent(ui::TouchEvent* event) override;
 
  protected:
   friend class MaximizeModeController;
 
   // The object should only be created by the ash::Shell.
   MaximizeModeWindowManager();
@@ skipping 48 matching lines @@
 
   // True if all backdrops are hidden.
   bool backdrops_hidden_;
 
   DISALLOW_COPY_AND_ASSIGN(MaximizeModeWindowManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_