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

chrome/browser/ui/ash/chrome_launcher_prefs.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 "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #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 {
 
 namespace {
 
 // App ID of default pinned apps.
 const char* kDefaultPinnedApps[] = {
   extension_misc::kGmailAppId,
   extension_misc::kGoogleDocAppId,
   extension_misc::kYoutubeAppId,
@@ skipping 197 matching lines @@
 void SetShelfAutoHideBehaviorPref(PrefService* prefs,
                                   int64_t display_id,
                                   ShelfAutoHideBehavior behavior) {
   DCHECK_GE(display_id, 0);
 
   const char* value = AutoHideBehaviorToPref(behavior);
   if (!value)
     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);
   }
 }
 
 wm::ShelfAlignment GetShelfAlignmentPref(PrefService* prefs,
                                          int64_t display_id) {
   DCHECK_GE(display_id, 0);
 
   // See comment in |kShelfAlignment| as to why we consider two prefs.
   return AlignmentFromPref(GetPerDisplayPref(
       prefs, display_id, prefs::kShelfAlignmentLocal, prefs::kShelfAlignment));
 }
 
 void SetShelfAlignmentPref(PrefService* prefs,
                            int64_t display_id,
                            wm::ShelfAlignment alignment) {
   DCHECK_GE(display_id, 0);
 
   const char* value = AlignmentToPref(alignment);
   if (!value)
     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);
   }
 }
 
 }  // namespace ash