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

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 103 matching lines @@
 #include "content/browser/android/browser_startup_controller.h"
 #include "content/browser/android/browser_surface_texture_manager.h"
 #include "content/browser/android/scoped_surface_request_manager.h"
 #include "content/browser/android/tracing_controller_android.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
 #include "content/browser/screen_orientation/screen_orientation_delegate_android.h"
 #include "content/public/browser/screen_orientation_provider.h"
 #include "gpu/ipc/client/android/in_process_surface_texture_manager.h"
 #include "media/base/android/media_client_android.h"
+#include "ui/android/screen_android.h"
+#include "ui/display/screen.h"
 #include "ui/gl/gl_surface.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/memory/memory_pressure_monitor_mac.h"
 #include "content/browser/bootstrap_sandbox_manager_mac.h"
 #include "content/browser/cocoa/system_hotkey_helper_mac.h"
 #include "content/browser/mach_broker_mac.h"
 #include "content/browser/renderer_host/browser_compositor_view_mac.h"
 #include "content/browser/theme_helper_mac.h"
@@ skipping 594 matching lines @@
       base::kNullProcessId);
   base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
       HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr);
   base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
       skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr);
   base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
       sql::SqlMemoryDumpProvider::GetInstance(), "Sql", nullptr);
 }
 
 int BrowserMainLoop::PreCreateThreads() {
+#if defined(OS_ANDROID)
+  // Let screen instance be overridable by parts.
+  display::Screen::SetScreenInstance(ui::CreateScreenAndroid());

[boliu, 2016/11/11 19:54:48]

linux puts this in PreMainMessageLoopRun

[Tima Vaisburd, 2016/11/11 21:32:25]

Sometimes it is in PreCreateThreads, though under USE_AURA:

https://cs.chromium.org/chromium/src/chrome/browser/ui/views/chrome_browser_m...
https://cs.chromium.org/chromium/src/chromecast/browser/cast_browser_main_par...

I moved, assuming USE_AURA and OS_ANDROID are mutually exclusive and I won't
override the existing setting. However, doesn't PreCreateThreads feel safer?

[boliu, 2016/11/11 21:36:10]

it hurts start up perf more

[Tima Vaisburd, 2016/11/11 23:44:43]

Done.
The relevant tests seem to pass again.

+#endif
+
   if (parts_) {
     TRACE_EVENT0("startup",
         "BrowserMainLoop::CreateThreads:PreCreateThreads");
 
     result_code_ = parts_->PreCreateThreads();
   }
 
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   // Note that we do not initialize a new FeatureList when calling this for
@@ skipping 858 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
         audio_thread_->task_runner();
     audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
                                                  std::move(worker_task_runner),
                                                  MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 }
 
 }  // namespace content