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

chrome/browser/ui/ash/chrome_launcher_prefs.cc

Index: chrome/browser/ui/ash/chrome_launcher_prefs.cc
diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
index 555487d1287cfbd43c9527ff1f7a0bff6cb7fd10..facb328e12daa59fda92df2a3d6b02a13e3b3764 100644
--- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc
+++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
@@ -17,7 +17,7 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 namespace ash {
 
@@ -235,7 +235,7 @@ void SetShelfAutoHideBehaviorPref(PrefService* prefs,
     return;
 
   SetPerDisplayPref(prefs, display_id, prefs::kShelfAutoHideBehavior, value);
-  if (display_id == gfx::Screen::GetScreen()->GetPrimaryDisplay().id()) {
+  if (display_id == display::Screen::GetScreen()->GetPrimaryDisplay().id()) {
     // See comment in |kShelfAlignment| about why we have two prefs here.
     prefs->SetString(prefs::kShelfAutoHideBehaviorLocal, value);
     prefs->SetString(prefs::kShelfAutoHideBehavior, value);
@@ -261,7 +261,7 @@ void SetShelfAlignmentPref(PrefService* prefs,
     return;
 
   SetPerDisplayPref(prefs, display_id, prefs::kShelfAlignment, value);
-  if (display_id == gfx::Screen::GetScreen()->GetPrimaryDisplay().id()) {
+  if (display_id == display::Screen::GetScreen()->GetPrimaryDisplay().id()) {
     // See comment in |kShelfAlignment| as to why we consider two prefs.
     prefs->SetString(prefs::kShelfAlignmentLocal, value);
     prefs->SetString(prefs::kShelfAlignment, value);