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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_main_loop.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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/browser_child_process_host_impl.cc ('k') | content/browser/gpu/gpu_arc_video_service_host.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 63ee2cca5d973a0c799d86f6d7edad6bf15d935c..5279f354f3539d704be4872deb19351927839694 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -176,8 +176,8 @@
#include "components/mus/public/interfaces/window_manager.mojom.h"
#include "content/common/mojo/mojo_shell_connection_impl.h"
#include "mojo/converters/network/network_type_converters.h"
+#include "mojo/edk/embedder/embedder.h"
#include "mojo/shell/public/cpp/application_impl.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
#include "ui/views/mus/window_manager_connection.h"
#endif
@@ -910,7 +910,7 @@ int BrowserMainLoop::CreateThreads() {
int BrowserMainLoop::PreMainMessageLoopRun() {
#if defined(MOJO_SHELL_CLIENT)
if (IsRunningInMojoShell()) {
- mojo::embedder::PreInitializeChildProcess();
+ mojo::edk::PreInitializeChildProcess();
MojoShellConnectionImpl::Create();
MojoShellConnectionImpl::Get()->BindToCommandLinePlatformChannel();
#if defined(USE_AURA)
« no previous file with comments | « content/browser/browser_child_process_host_impl.cc ('k') | content/browser/gpu/gpu_arc_video_service_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698