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

ash/wm/overview/window_selector.h

 // Copyright 2013 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_OVERVIEW_WINDOW_SELECTOR_H_
 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tracker.h"
+#include "ui/display/display_observer.h"
 #include "ui/events/event_handler.h"
-#include "ui/gfx/display_observer.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 class RootWindow;
 class Window;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class LocatedEvent;
 }
 
 namespace views {
 class Textfield;
 class Widget;
 }
 
 namespace ash {
 class WindowSelectorDelegate;
 class WindowSelectorItem;
 class WindowSelectorTest;
 class WindowGrid;
 
 // The WindowSelector shows a grid of all of your windows, allowing to select
 // one by clicking or tapping on it.
-class ASH_EXPORT WindowSelector
-    : public gfx::DisplayObserver,
-      public aura::WindowObserver,
-      public aura::client::ActivationChangeObserver,
-      public views::TextfieldController {
+class ASH_EXPORT WindowSelector : public display::DisplayObserver,
+                                  public aura::WindowObserver,
+                                  public aura::client::ActivationChangeObserver,
+                                  public views::TextfieldController {
  public:
   // The distance between the top edge of the screen and the bottom edge of
   // the text filtering textfield.
   static const int kTextFilterBottomEdge;
 
   // Returns true if the window can be selected in overview mode.
   static bool IsSelectable(aura::Window* window);
 
   enum Direction {
     LEFT,
@@ skipping 20 matching lines @@
   // Called when the last window selector item from a grid is deleted.
   void OnGridEmpty(WindowGrid* grid);
 
   // Activates |window|.
   void SelectWindow(aura::Window* window);
 
   bool restoring_minimized_windows() const {
     return restoring_minimized_windows_;
   }
 
-  // gfx::DisplayObserver:
-  void OnDisplayAdded(const gfx::Display& display) override;
-  void OnDisplayRemoved(const gfx::Display& display) override;
-  void OnDisplayMetricsChanged(const gfx::Display& display,
+  // display::DisplayObserver:
+  void OnDisplayAdded(const display::Display& display) override;
+  void OnDisplayRemoved(const display::Display& display) override;
+  void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
   // aura::WindowObserver:
   void OnWindowAdded(aura::Window* new_window) override;
   void OnWindowDestroying(aura::Window* window) override;
 
   // aura::client::ActivationChangeObserver:
   void OnWindowActivated(
       aura::client::ActivationChangeObserver::ActivationReason reason,
       aura::Window* gained_active,
@@ skipping 82 matching lines @@
   // Tracks whether minimized windows are currently being restored for overview
   // mode.
   bool restoring_minimized_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSelector);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_