Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: content/browser/browser_main_loop.cc

Issue 2087333002: mus::GpuService: Support establish GpuChannel asynchronously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the unittests Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 8c90372bed2931a50d01a8404fec70de81c6e0ff..91d86e1b02eb1fb00914fa834d073e2cb9a0d629 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -191,6 +191,11 @@
#include "gpu/vulkan/vulkan_implementation.h"
#endif
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+#include "components/mus/common/gpu_service.h" // nogncheck
+#endif
+
+
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
@@ -1171,8 +1176,11 @@ int BrowserMainLoop::BrowserThreadsStarted() {
#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
// TODO(rockot): Remove the blocking wait for init.
// http://crbug.com/594852.
- if (MojoShellConnection::GetForProcess())
+ auto connection = MojoShellConnection::GetForProcess();
+ if (connection) {
WaitForMojoShellInitialize();
+ mus::GpuService::Initialize(connection->GetConnector());
+ }
#endif
}
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698