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

Unified Diff: chrome/app/mash/mash_runner.cc

Issue 1797153002: Reinstate wait-for-Initialize when Chrome is run in Mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell-client
Patch Set: fix views_mus_unittests too 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 | « no previous file | content/common/mojo/mojo_shell_connection_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/mash/mash_runner.cc
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index 839857d61c33b31ad80d3c544faa3c3c1b09e831..61d0756da17b1a5c437715a3e849ada619eb7841 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -138,6 +138,7 @@ class NativeRunnerDelegateImpl : public mojo::shell::NativeRunnerDelegate {
void AdjustCommandLineArgumentsForTarget(
const mojo::Identity& target,
base::CommandLine* command_line) override {
+ command_line->AppendSwitch(switches::kWaitForMojoShell);
if (target.name() != "exe:chrome") {
if (target.name() == "exe:chrome_mash")
ChangeChromeMashToChrome(command_line);
« no previous file with comments | « no previous file | content/common/mojo/mojo_shell_connection_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698