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

Unified Diff: mojo/shell/shell_application_delegate.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 | « mojo/shell/public/cpp/tests/BUILD.gn ('k') | net/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/shell_application_delegate.cc
diff --git a/mojo/shell/shell_application_delegate.cc b/mojo/shell/shell_application_delegate.cc
index 1dbac46037b18232c54243e677e9009374415fee..ec3e9db032d76c9a21dc4454aba54fbe371d8d38 100644
--- a/mojo/shell/shell_application_delegate.cc
+++ b/mojo/shell/shell_application_delegate.cc
@@ -9,9 +9,10 @@
#include <utility>
#include "base/process/process.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
#include "mojo/shell/application_manager.h"
#include "mojo/shell/public/cpp/application_connection.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
namespace mojo {
namespace shell {
@@ -74,11 +75,11 @@ void ShellApplicationDelegate::RegisterProcessWithBroker(
}
}
- embedder::ScopedPlatformHandle platform_pipe;
- MojoResult rv = embedder::PassWrappedPlatformHandle(
+ edk::ScopedPlatformHandle platform_pipe;
+ MojoResult rv = edk::PassWrappedPlatformHandle(
pipe.release().value(), &platform_pipe);
CHECK_EQ(rv, MOJO_RESULT_OK);
- embedder::ChildProcessLaunched(process.Handle(), std::move(platform_pipe));
+ edk::ChildProcessLaunched(process.Handle(), std::move(platform_pipe));
}
void ShellApplicationDelegate::AddListener(
« no previous file with comments | « mojo/shell/public/cpp/tests/BUILD.gn ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698