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

Side by Side Diff: mojo/shell/standalone/desktop/launcher_process.cc

Issue 1630823002: Move mojo/runner to mojo/shell/standalone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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/shell/standalone/desktop/launcher_process.h ('k') | mojo/shell/standalone/desktop/main.cc » ('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
11 #include "base/base_switches.h" 11 #include "base/base_switches.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/debug/stack_trace.h" 14 #include "base/debug/stack_trace.h"
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/synchronization/waitable_event.h" 18 #include "base/synchronization/waitable_event.h"
19 #include "base/threading/platform_thread.h" 19 #include "base/threading/platform_thread.h"
20 #include "mojo/runner/context.h" 20 #include "mojo/shell/standalone/context.h"
21 #include "mojo/runner/switches.h" 21 #include "mojo/shell/standalone/switches.h"
22 #include "mojo/shell/switches.h" 22 #include "mojo/shell/switches.h"
23 23
24 namespace mojo { 24 namespace mojo {
25 namespace runner { 25 namespace shell {
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"); 35 command_line->AppendSwitch("use-new-edk");
36 // http://crbug.com/546644 36 // http://crbug.com/546644
37 command_line->AppendSwitch(switches::kMojoNoSandbox); 37 command_line->AppendSwitch(switches::kMojoNoSandbox);
38 38
39 base::PlatformThread::SetName("mojo_runner"); 39 base::PlatformThread::SetName("mojo_runner");
40 40
41 // We want the shell::Context to outlive the MessageLoop so that pipes are 41 // We want the Context to outlive the MessageLoop so that pipes are all
42 // all gracefully closed / error-out before we try to shut the Context down. 42 // gracefully closed / error-out before we try to shut the Context down.
43 Context shell_context; 43 Context shell_context;
44 { 44 {
45 base::MessageLoop message_loop; 45 base::MessageLoop message_loop;
46 base::FilePath shell_dir; 46 base::FilePath shell_dir;
47 PathService::Get(base::DIR_MODULE, &shell_dir); 47 PathService::Get(base::DIR_MODULE, &shell_dir);
48 if (!shell_context.Init(shell_dir)) 48 if (!shell_context.Init(shell_dir))
49 return 0; 49 return 0;
50 50
51 if (mojo_url.is_empty()) { 51 if (mojo_url.is_empty()) {
52 message_loop.PostTask( 52 message_loop.PostTask(
53 FROM_HERE, 53 FROM_HERE,
54 base::Bind(&Context::RunCommandLineApplication, 54 base::Bind(&Context::RunCommandLineApplication,
55 base::Unretained(&shell_context), base::Closure())); 55 base::Unretained(&shell_context), base::Closure()));
56 } else { 56 } else {
57 message_loop.PostTask(FROM_HERE, 57 message_loop.PostTask(
58 base::Bind(&mojo::runner::Context::Run, 58 FROM_HERE, base::Bind(&mojo::shell::Context::Run,
59 base::Unretained(&shell_context), 59 base::Unretained(&shell_context), mojo_url));
60 mojo_url));
61 } 60 }
62 message_loop.Run(); 61 message_loop.Run();
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 shell
72 } // namespace mojo 71 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/standalone/desktop/launcher_process.h ('k') | mojo/shell/standalone/desktop/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698