Reland of Android: support multiple displays on C++ side

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 57 matching lines @@
 #include <sys/prctl.h>
 #endif
 #if defined(OS_LINUX)
 #include <fontconfig/fontconfig.h>
 #endif
 
 #if defined(OS_ANDROID)
 #include "chromecast/app/android/crash_handler.h"
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
+#include "ui/android/screen_android.h"
+#include "ui/display/screen.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/display/screen.h"
@@ skipping 315 matching lines @@
 
   // Set GL strings so GPU config code can make correct feature blacklisting/
   // whitelisting decisions.
   // Note: SetGLStrings can be called before GpuDataManager::Initialize.
   std::unique_ptr<CastSysInfo> sys_info = CreateSysInfo();
   content::GpuDataManager::GetInstance()->SetGLStrings(
       sys_info->GetGlVendor(), sys_info->GetGlRenderer(),
       sys_info->GetGlVersion());
 #endif
 
-#if defined(USE_AURA)
+#if defined(OS_ANDROID)
+  display::Screen::SetScreenInstance(ui::CreateScreenAndroid());
+#elif defined(USE_AURA)
   cast_browser_process_->SetCastScreen(base::WrapUnique(new CastScreen()));
   DCHECK(!display::Screen::GetScreen());
   display::Screen::SetScreenInstance(cast_browser_process_->cast_screen());
 #endif
 
   content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
       kChromeResourceScheme);
   return 0;
 }
 
@@ skipping 117 matching lines @@
 
 void CastBrowserMainParts::PostDestroyThreads() {
 #if !defined(OS_ANDROID)
   media_resource_tracker_->FinalizeAndDestroy();
   media_resource_tracker_ = nullptr;
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast