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

Unified Diff: mash/example/window_type_launcher/main.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 | « content/public/common/content_switches.cc ('k') | mojo/edk/embedder/embedder.h » ('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 3932a375df78a15b815154ae20f937638201d1a5..e0e178d969744d468fdbd8d17ca0341fc46a654a 100644
--- a/mash/example/window_type_launcher/main.cc
+++ b/mash/example/window_type_launcher/main.cc
@@ -16,7 +16,6 @@
#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/shell/public/cpp/shell_connection.h"
#include "mojo/shell/public/interfaces/shell_client.mojom.h"
#include "mojo/shell/runner/child/runner_connection.h"
@@ -60,14 +59,13 @@ int main(int argc, char** argv) {
CHECK(io_thread.StartWithOptions(io_thread_options));
mojo::edk::InitIPCSupport(&process_delegate, io_thread.task_runner().get());
+ mojo::edk::SetParentPipeHandleFromCommandLine();
- mojo::shell::mojom::ShellClientRequest request;
- scoped_ptr<mojo::shell::RunnerConnection> connection(
- mojo::shell::RunnerConnection::ConnectToRunner(
- &request, mojo::ScopedMessagePipeHandle()));
- base::MessageLoop loop(mojo::common::MessagePumpMojo::Create());
+ base::MessageLoop loop;
WindowTypeLauncher delegate;
- mojo::ShellConnection impl(&delegate, std::move(request));
+ mojo::ShellConnection impl(&delegate);
+ scoped_ptr<mojo::shell::RunnerConnection> connection =
+ mojo::shell::RunnerConnection::Create(&impl);
loop.Run();
mojo::edk::ShutdownIPCSupport();
« no previous file with comments | « content/public/common/content_switches.cc ('k') | mojo/edk/embedder/embedder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698