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

ash/shelf/shelf_window_watcher.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_SHELF_SHELF_WINDOW_WATCHER_H_
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 
 #include <stdint.h>
 
 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "ui/aura/window_observer.h"
-#include "ui/gfx/display_observer.h"
+#include "ui/display/display_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 
 class Window;
 
 namespace client {
 class ActivationClient;
 }
 
 }  // namespace aura
 
 namespace ash {
 
 class ShelfModel;
 class ShelfItemDelegateManager;
 
 // ShelfWindowWatcher creates and handles a ShelfItem for windows that have
 // a ShelfItemDetails property in the default container.
 class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
                            public aura::WindowObserver,
-                           public gfx::DisplayObserver {
+                           public display::DisplayObserver {
  public:
   ShelfWindowWatcher(ShelfModel* model,
                      ShelfItemDelegateManager* item_delegate_manager);
   ~ShelfWindowWatcher() override;
 
  private:
   class RootWindowObserver : public aura::WindowObserver {
    public:
     explicit RootWindowObserver(ShelfWindowWatcher* window_watcher);
     ~RootWindowObserver() override;
@@ skipping 62 matching lines @@
       aura::Window* lost_active) override;
 
   // aura::WindowObserver overrides:
   void OnWindowAdded(aura::Window* window) override;
   void OnWillRemoveWindow(aura::Window* window) override;
   void OnWindowDestroying(aura::Window* window) override;
   void OnWindowPropertyChanged(aura::Window* window,
                                const void* key,
                                intptr_t old) override;
 
-  // gfx::DisplayObserver overrides:
-  void OnDisplayAdded(const gfx::Display& display) override;
-  void OnDisplayRemoved(const gfx::Display& old_display) override;
-  void OnDisplayMetricsChanged(const gfx::Display& display,
+  // display::DisplayObserver overrides:
+  void OnDisplayAdded(const display::Display& display) override;
+  void OnDisplayRemoved(const display::Display& old_display) override;
+  void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
   // Owned by Shell.
   ShelfModel* model_;
   ShelfItemDelegateManager* item_delegate_manager_;
 
   RootWindowObserver root_window_observer_;
 
   RemovedWindowObserver removed_window_observer_;
 
   // Holds all observed windows.
   ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
 
   // Holds all observed root windows.
   ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_;
 
   // Holds removed windows that has an item from default container.
   ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_;
 
   // Holds all observed activation clients.
   ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
       aura::client::ActivationChangeObserver> observed_activation_clients_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WINDOW_WATCHER_H_