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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_main_loop.cc

Issue 1793793002: Remove ShellConnection::WaitForInitialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « components/mus/ws/window_tree_client_unittest.cc ('k') | content/child/child_thread_impl.cc » ('j') | content/child/child_thread_impl.cc » ('J')
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 162f0269445b157301337215fa80f7ae86decccc..db8e613876feeeb517feb40226ead0207b3e1c70 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -914,10 +914,12 @@ int BrowserMainLoop::CreateThreads() {
int BrowserMainLoop::PreMainMessageLoopRun() {
if (IsRunningInMojoShell()) {
MojoShellConnectionImpl::Create();
- MojoShellConnectionImpl::Get()->BindToCommandLinePlatformChannel();
+ MojoShellConnectionImpl::Get()->Connect(nullptr);
#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
- views::WindowManagerConnection::Create(
- MojoShellConnection::Get()->GetConnector());
+ if (MojoShellConnection::Get()) {
+ views::WindowManagerConnection::Create(
+ MojoShellConnection::Get()->GetConnector());
+ }
#endif
}
« no previous file with comments | « components/mus/ws/window_tree_client_unittest.cc ('k') | content/child/child_thread_impl.cc » ('j') | content/child/child_thread_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698