Rename gfx::Display/Screen to display::Display/Screen in chromecast/blimp/media

chromecast/browser/cast_browser_main_parts.cc

 // Copyright 2014 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 "chromecast/browser/cast_browser_main_parts.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <string>
@@ skipping 61 matching lines @@
 #include "net/android/network_change_notifier_factory_android.h"
 #else
 #include "chromecast/net/network_change_notifier_factory_cast.h"
 #endif
 
 #if defined(USE_AURA)
 // gn check ignored on OverlayManagerCast as it's not a public ozone
 // header, but is exported to allow injecting the overlay-composited
 // callback.
 #include "chromecast/graphics/cast_screen.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/ozone/platform/cast/overlay_manager_cast.h"  // nogncheck
 #endif
 
 namespace {
 
 #if !defined(OS_ANDROID)
 int kSignalsToRunClosure[] = { SIGTERM, SIGINT, };
 // Closure to run on SIGTERM and SIGINT.
 base::Closure* g_signal_closure = nullptr;
 base::PlatformThreadId g_main_thread_id;
@@ skipping 268 matching lines @@
       sys_info->GetGlVendor(), sys_info->GetGlRenderer(),
       sys_info->GetGlVersion());
 #endif
 
 #if defined(USE_AURA)
   // Screen can (and should) exist even with no displays connected. Its presence
   // is assumed as an interface to access display information, e.g. from metrics
   // code.  See CastContentWindow::CreateWindowTree for update when resolution
   // is available.
   cast_browser_process_->SetCastScreen(base::WrapUnique(new CastScreen));
-  DCHECK(!gfx::Screen::GetScreen());
-  gfx::Screen::SetScreenInstance(cast_browser_process_->cast_screen());
+  DCHECK(!display::Screen::GetScreen());
+  display::Screen::SetScreenInstance(cast_browser_process_->cast_screen());
 #endif
 
   content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
       kChromeResourceScheme);
   return 0;
 }
 
 void CastBrowserMainParts::PreMainMessageLoopRun() {
   scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple());
   metrics::RegisterPrefs(pref_registry.get());
@@ skipping 115 matching lines @@
 void CastBrowserMainParts::PostDestroyThreads() {
 #if !defined(OS_ANDROID)
   media_resource_tracker_->FinalizeAndDestroy();
   media_resource_tracker_ = nullptr;
   media_pipeline_backend_manager_.reset();
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast