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

Side by Side Diff: mandoline/app/desktop/launcher_process.cc

Issue 1429263005: Revert of mandoline: Fix ICU initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 15 matching lines...) Expand all
26 26
27 namespace mandoline { 27 namespace mandoline {
28 28
29 int LauncherProcessMain(int argc, char** argv) { 29 int LauncherProcessMain(int argc, char** argv) {
30 mojo::runner::Tracer tracer; 30 mojo::runner::Tracer tracer;
31 base::CommandLine* command_line = 31 base::CommandLine* command_line =
32 base::CommandLine::ForCurrentProcess(); 32 base::CommandLine::ForCurrentProcess();
33 if (!command_line->HasSwitch(switches::kMojoSingleProcess)) 33 if (!command_line->HasSwitch(switches::kMojoSingleProcess))
34 command_line->AppendSwitch(switches::kEnableMultiprocess); 34 command_line->AppendSwitch(switches::kEnableMultiprocess);
35 command_line->AppendSwitch("use-new-edk"); 35 command_line->AppendSwitch("use-new-edk");
36 // http://crbug.com/546644
37 command_line->AppendSwitch(switches::kMojoNoSandbox);
36 38
37 bool trace_startup = command_line->HasSwitch(switches::kTraceStartup); 39 bool trace_startup = command_line->HasSwitch(switches::kTraceStartup);
38 if (trace_startup) { 40 if (trace_startup) {
39 tracer.Start( 41 tracer.Start(
40 command_line->GetSwitchValueASCII(switches::kTraceStartup), 42 command_line->GetSwitchValueASCII(switches::kTraceStartup),
41 command_line->GetSwitchValueASCII(switches::kTraceStartupDuration), 43 command_line->GetSwitchValueASCII(switches::kTraceStartupDuration),
42 "mandoline.trace"); 44 "mandoline.trace");
43 } 45 }
44 46
45 // We want the runner::Context to outlive the MessageLoop so that pipes are 47 // We want the runner::Context to outlive the MessageLoop so that pipes are
(...skipping 15 matching lines...) Expand all
61 message_loop.Run(); 63 message_loop.Run();
62 64
63 // Must be called before |message_loop| is destroyed. 65 // Must be called before |message_loop| is destroyed.
64 shell_context.Shutdown(); 66 shell_context.Shutdown();
65 } 67 }
66 68
67 return 0; 69 return 0;
68 } 70 }
69 71
70 } // namespace mandoline 72 } // namespace mandoline
OLDNEW
« no previous file with comments | « components/resource_provider/resource_provider_impl.cc ('k') | mandoline/services/core_services/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698