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

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

Issue 1431133003: mandoline: Reland "Fix ICU initialization". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT and then fix compile. 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 14 matching lines...) Expand all
25 25
26 namespace mandoline { 26 namespace mandoline {
27 27
28 int LauncherProcessMain(int argc, char** argv) { 28 int LauncherProcessMain(int argc, char** argv) {
29 mojo::runner::Tracer tracer; 29 mojo::runner::Tracer tracer;
30 base::CommandLine* command_line = 30 base::CommandLine* command_line =
31 base::CommandLine::ForCurrentProcess(); 31 base::CommandLine::ForCurrentProcess();
32 if (!command_line->HasSwitch(switches::kMojoSingleProcess)) 32 if (!command_line->HasSwitch(switches::kMojoSingleProcess))
33 command_line->AppendSwitch(switches::kEnableMultiprocess); 33 command_line->AppendSwitch(switches::kEnableMultiprocess);
34 command_line->AppendSwitch("use-new-edk"); 34 command_line->AppendSwitch("use-new-edk");
35 // http://crbug.com/546644
36 command_line->AppendSwitch(switches::kMojoNoSandbox);
37 35
38 bool trace_startup = command_line->HasSwitch(switches::kTraceStartup); 36 bool trace_startup = command_line->HasSwitch(switches::kTraceStartup);
39 if (trace_startup) { 37 if (trace_startup) {
40 tracer.Start( 38 tracer.Start(
41 command_line->GetSwitchValueASCII(switches::kTraceStartup), 39 command_line->GetSwitchValueASCII(switches::kTraceStartup),
42 command_line->GetSwitchValueASCII(switches::kTraceStartupDuration), 40 command_line->GetSwitchValueASCII(switches::kTraceStartupDuration),
43 "mandoline.trace"); 41 "mandoline.trace");
44 } 42 }
45 43
46 // We want the runner::Context to outlive the MessageLoop so that pipes are 44 // We want the runner::Context to outlive the MessageLoop so that pipes are
(...skipping 14 matching lines...) Expand all
61 message_loop.Run(); 59 message_loop.Run();
62 60
63 // Must be called before |message_loop| is destroyed. 61 // Must be called before |message_loop| is destroyed.
64 shell_context.Shutdown(); 62 shell_context.Shutdown();
65 } 63 }
66 64
67 return 0; 65 return 0;
68 } 66 }
69 67
70 } // namespace mandoline 68 } // 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