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

ash/shell/window_watcher.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/shell/window_watcher.h"
 
 #include <utility>
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell/window_watcher_shelf_item_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace ash {
 namespace shell {
 
 class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
  public:
   explicit WorkspaceWindowWatcher(WindowWatcher* watcher) : watcher_(watcher) {
   }
 
   ~WorkspaceWindowWatcher() override {}
@@ skipping 99 matching lines @@
       ShelfModel* model = Shell::GetInstance()->shelf_model();
       int index = model->ItemIndexByID(i->first);
       DCHECK_NE(-1, index);
       model->RemoveItemAt(index);
       id_to_window_.erase(i);
       break;
     }
   }
 }
 
-void WindowWatcher::OnDisplayAdded(const gfx::Display& new_display) {
+void WindowWatcher::OnDisplayAdded(const display::Display& new_display) {
   aura::Window* root = Shell::GetInstance()
                            ->window_tree_host_manager()
                            ->GetRootWindowForDisplayId(new_display.id());
   workspace_window_watcher_->RootWindowAdded(root);
 }
 
-void WindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
+void WindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
   // All windows in the display has already been removed, so no need to
   // remove observers.
 }
 
-void WindowWatcher::OnDisplayMetricsChanged(const gfx::Display&, uint32_t) {
+void WindowWatcher::OnDisplayMetricsChanged(const display::Display&, uint32_t) {
 }
 
 }  // namespace shell
 }  // namespace ash