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

Side by Side Diff: mojo/runner/desktop/launcher_process.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 unified diff | Download patch
« no previous file with comments | « mojo/runner/context.cc ('k') | mojo/runner/host/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdio.h> 5 #include <stdio.h>
6 #include <string.h> 6 #include <string.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <iostream> 9 #include <iostream>
10 10
(...skipping 14 matching lines...) Expand all
25 namespace runner { 25 namespace runner {
26 26
27 int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) { 27 int LauncherProcessMain(const GURL& mojo_url, const base::Closure& callback) {
28 #if !defined(OFFICIAL_BUILD) 28 #if !defined(OFFICIAL_BUILD)
29 base::debug::EnableInProcessStackDumping(); 29 base::debug::EnableInProcessStackDumping();
30 #endif 30 #endif
31 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 31 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
32 if (!command_line->HasSwitch(switches::kMojoSingleProcess) && 32 if (!command_line->HasSwitch(switches::kMojoSingleProcess) &&
33 !command_line->HasSwitch("gtest_list_tests")) 33 !command_line->HasSwitch("gtest_list_tests"))
34 command_line->AppendSwitch(switches::kEnableMultiprocess); 34 command_line->AppendSwitch(switches::kEnableMultiprocess);
35 command_line->AppendSwitch("use-new-edk");
36 // http://crbug.com/546644 35 // http://crbug.com/546644
37 command_line->AppendSwitch(switches::kMojoNoSandbox); 36 command_line->AppendSwitch(switches::kMojoNoSandbox);
38 37
39 base::PlatformThread::SetName("mojo_runner"); 38 base::PlatformThread::SetName("mojo_runner");
40 39
41 // We want the shell::Context to outlive the MessageLoop so that pipes are 40 // We want the shell::Context to outlive the MessageLoop so that pipes are
42 // all gracefully closed / error-out before we try to shut the Context down. 41 // all gracefully closed / error-out before we try to shut the Context down.
43 Context shell_context; 42 Context shell_context;
44 { 43 {
45 base::MessageLoop message_loop; 44 base::MessageLoop message_loop;
(...skipping 17 matching lines...) Expand all
63 62
64 // Must be called before |message_loop| is destroyed. 63 // Must be called before |message_loop| is destroyed.
65 shell_context.Shutdown(); 64 shell_context.Shutdown();
66 } 65 }
67 66
68 return 0; 67 return 0;
69 } 68 }
70 69
71 } // namespace runner 70 } // namespace runner
72 } // namespace mojo 71 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/runner/context.cc ('k') | mojo/runner/host/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698