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

ash/display/display_layout_store.cc

Index: ash/display/display_layout_store.cc
diff --git a/ash/display/display_layout_store.cc b/ash/display/display_layout_store.cc
index fbca57fce3df04b89de91d650a9d76549b634d82..3f91817a58af00ae54d591314b8152d14f30b5bc 100644
--- a/ash/display/display_layout_store.cc
+++ b/ash/display/display_layout_store.cc
@@ -11,7 +11,7 @@
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace ash {
 
@@ -62,7 +62,8 @@ void DisplayLayoutStore::RegisterLayoutForDisplayIdList(
   // Old data may not have the display_id/parent_display_id.
   // Guess these values based on the saved primary_id.
   if (layout->placement_list.size() >= 1 &&
-      layout->placement_list[0].display_id == gfx::Display::kInvalidDisplayID) {
+      layout->placement_list[0].display_id ==
+          display::Display::kInvalidDisplayID) {
     if (layout->primary_id == list[1]) {
       layout->placement_list[0].display_id = list[0];
       layout->placement_list[0].parent_display_id = list[1];
@@ -85,7 +86,7 @@ const display::DisplayLayout& DisplayLayoutStore::GetRegisteredDisplayLayout(
                                              ? iter->second.get()
                                              : CreateDefaultDisplayLayout(list);
   DCHECK(display::DisplayLayout::Validate(list, *layout)) << layout->ToString();
-  DCHECK_NE(layout->primary_id, gfx::Display::kInvalidDisplayID);
+  DCHECK_NE(layout->primary_id, display::Display::kInvalidDisplayID);
   return *layout;
 }