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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2027093002: mus: Initialize WindowManagerConnection in chrome instead of in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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') | services/navigation/content_client/BUILD.gn » ('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 b395be37ae1571d2e963aa87283ae287572bf2b8..9b6915d031d75821dac7fcd05edefc23307ab326 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -186,11 +186,6 @@
#include "crypto/nss_util.h"
#endif
-#if defined(MOJO_SHELL_CLIENT)
-#include "services/shell/public/cpp/connector.h"
-#include "ui/views/mus/window_manager_connection.h"
-#endif
-
#if defined(ENABLE_VULKAN)
#include "gpu/vulkan/vulkan_implementation.h"
#endif
@@ -1211,15 +1206,11 @@ int BrowserMainLoop::BrowserThreadsStarted() {
mojo_shell_context_.reset(new MojoShellContext);
if (IsRunningInMojoShell()) {
#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+ // TODO(rockot): Remove the blocking wait for init.
+ // http://crbug.com/594852.
MojoShellConnection* mojo_shell_connection = MojoShellConnection::Get();
- if (mojo_shell_connection) {
- // TODO(rockot): Remove the blocking wait for init.
- // http://crbug.com/594852.
+ if (mojo_shell_connection)
WaitForMojoShellInitialize();
- views::WindowManagerConnection::Create(
- mojo_shell_connection->GetConnector(),
- mojo_shell_connection->GetIdentity());
- }
#endif
}
« no previous file with comments | « content/browser/DEPS ('k') | services/navigation/content_client/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698