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

Unified Diff: mash/example/window_type_launcher/main.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 | « mash/example/window_type_launcher/DEPS ('k') | mash/wm/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/example/window_type_launcher/main.cc
diff --git a/mash/example/window_type_launcher/main.cc b/mash/example/window_type_launcher/main.cc
index 27d8cd3100ebaf6394057d120780306e5efe10ae..d8244398438bb0e867002da655393174602128fa 100644
--- a/mash/example/window_type_launcher/main.cc
+++ b/mash/example/window_type_launcher/main.cc
@@ -14,17 +14,17 @@
#include "base/threading/thread.h"
#include "build/build_config.h"
#include "mash/example/window_type_launcher/window_type_launcher.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/process_delegate.h"
#include "mojo/message_pump/message_pump_mojo.h"
#include "mojo/runner/child/runner_connection.h"
#include "mojo/runner/init.h"
#include "mojo/shell/public/cpp/application_impl.h"
#include "mojo/shell/public/interfaces/application.mojom.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
namespace {
-class ProcessDelegate : public mojo::embedder::ProcessDelegate {
+class ProcessDelegate : public mojo::edk::ProcessDelegate {
public:
ProcessDelegate() {}
~ProcessDelegate() override {}
@@ -52,18 +52,15 @@ int main(int argc, char** argv) {
#endif
{
- mojo::embedder::PreInitializeChildProcess();
- mojo::embedder::Init();
+ mojo::edk::PreInitializeChildProcess();
+ mojo::edk::Init();
ProcessDelegate process_delegate;
base::Thread io_thread("io_thread");
base::Thread::Options io_thread_options(base::MessageLoop::TYPE_IO, 0);
CHECK(io_thread.StartWithOptions(io_thread_options));
- mojo::embedder::InitIPCSupport(mojo::embedder::ProcessType::NONE,
- &process_delegate,
- io_thread.task_runner().get(),
- mojo::embedder::ScopedPlatformHandle());
+ mojo::edk::InitIPCSupport(&process_delegate, io_thread.task_runner().get());
mojo::InterfaceRequest<mojo::Application> application_request;
scoped_ptr<mojo::runner::RunnerConnection> connection(
@@ -74,7 +71,7 @@ int main(int argc, char** argv) {
mojo::ApplicationImpl impl(&delegate, std::move(application_request));
loop.Run();
- mojo::embedder::ShutdownIPCSupport();
+ mojo::edk::ShutdownIPCSupport();
}
return 0;
« no previous file with comments | « mash/example/window_type_launcher/DEPS ('k') | mash/wm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698