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

ash/system/web_notification/ash_popup_alignment_delegate.cc

Index: ash/system/web_notification/ash_popup_alignment_delegate.cc
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.cc b/ash/system/web_notification/ash_popup_alignment_delegate.cc
index 71612f2b5d2427791c68a77dfd90c3a27be9b433..4f31f1f610211895e6b5162668e51464f528575a 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate.cc
@@ -13,9 +13,9 @@
 #include "ash/shell.h"
 #include "base/i18n/rtl.h"
 #include "ui/aura/window.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/message_popup_collection.h"
 
@@ -44,8 +44,9 @@ AshPopupAlignmentDelegate::~AshPopupAlignmentDelegate() {
   shelf_->RemoveObserver(this);
 }
 
-void AshPopupAlignmentDelegate::StartObserving(gfx::Screen* screen,
-                                               const gfx::Display& display) {
+void AshPopupAlignmentDelegate::StartObserving(
+    display::Screen* screen,
+    const display::Display& display) {
   screen_ = screen;
   work_area_ = display.work_area();
   screen->AddObserver(this);
@@ -102,7 +103,7 @@ bool AshPopupAlignmentDelegate::IsFromLeft() const {
 }
 
 void AshPopupAlignmentDelegate::RecomputeAlignment(
-    const gfx::Display& display) {
+    const display::Display& display) {
   // Nothing needs to be done.
 }
 
@@ -110,8 +111,8 @@ wm::ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
   return shelf_->GetAlignment();
 }
 
-gfx::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
-  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(
+display::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
+  return display::Screen::GetScreen()->GetDisplayNearestWindow(
       shelf_->shelf_widget()->GetNativeView());
 }
 
@@ -135,15 +136,13 @@ void AshPopupAlignmentDelegate::OnAutoHideStateChanged(
 }
 
 void AshPopupAlignmentDelegate::OnDisplayAdded(
-    const gfx::Display& new_display) {
-}
+    const display::Display& new_display) {}
 
 void AshPopupAlignmentDelegate::OnDisplayRemoved(
-    const gfx::Display& old_display) {
-}
+    const display::Display& old_display) {}
 
 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
-    const gfx::Display& display,
+    const display::Display& display,
     uint32_t metrics) {
   if (GetCurrentDisplay().id() == display.id())
     UpdateWorkArea();