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

Side by Side Diff: mojo/runner/desktop/launcher_process.cc

Issue 1342503003: Move fetching logic out of ApplicationManager, eliminate url mappings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 3 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/in_process_native_runner_unittest.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/files/file_util.h" 14 #include "base/files/file_util.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/path_service.h"
16 #include "base/synchronization/waitable_event.h" 17 #include "base/synchronization/waitable_event.h"
17 #include "base/trace_event/trace_event.h" 18 #include "base/trace_event/trace_event.h"
18 #include "components/tracing/trace_config_file.h" 19 #include "components/tracing/trace_config_file.h"
19 #include "components/tracing/tracing_switches.h" 20 #include "components/tracing/tracing_switches.h"
20 #include "mojo/runner/context.h" 21 #include "mojo/runner/context.h"
21 #include "mojo/runner/switches.h" 22 #include "mojo/runner/switches.h"
22 23
23 namespace mojo { 24 namespace mojo {
24 namespace runner { 25 namespace runner {
25 namespace { 26 namespace {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 trace_config, base::trace_event::TraceLog::RECORDING_MODE); 92 trace_config, base::trace_event::TraceLog::RECORDING_MODE);
92 } else if (tracing::TraceConfigFile::GetInstance()->IsEnabled()) { 93 } else if (tracing::TraceConfigFile::GetInstance()->IsEnabled()) {
93 g_tracing = true; 94 g_tracing = true;
94 base::trace_event::TraceLog::GetInstance()->SetEnabled( 95 base::trace_event::TraceLog::GetInstance()->SetEnabled(
95 tracing::TraceConfigFile::GetInstance()->GetTraceConfig(), 96 tracing::TraceConfigFile::GetInstance()->GetTraceConfig(),
96 base::trace_event::TraceLog::RECORDING_MODE); 97 base::trace_event::TraceLog::RECORDING_MODE);
97 } 98 }
98 99
99 // We want the shell::Context to outlive the MessageLoop so that pipes are 100 // We want the shell::Context to outlive the MessageLoop so that pipes are
100 // all gracefully closed / error-out before we try to shut the Context down. 101 // all gracefully closed / error-out before we try to shut the Context down.
101 Context shell_context; 102 base::FilePath shell_dir;
103 PathService::Get(base::DIR_MODULE, &shell_dir);
104 Context shell_context(shell_dir);
102 { 105 {
103 base::MessageLoop message_loop; 106 base::MessageLoop message_loop;
104 if (!shell_context.Init()) { 107 if (!shell_context.Init()) {
105 return 0; 108 return 0;
106 } 109 }
107 if (g_tracing) { 110 if (g_tracing) {
108 message_loop.PostDelayedTask(FROM_HERE, 111 message_loop.PostDelayedTask(FROM_HERE,
109 base::Bind(StopTracingAndFlushToDisk), 112 base::Bind(StopTracingAndFlushToDisk),
110 base::TimeDelta::FromSeconds(5)); 113 base::TimeDelta::FromSeconds(5));
111 } 114 }
112 115
113 message_loop.PostTask( 116 message_loop.PostTask(
114 FROM_HERE, 117 FROM_HERE,
115 base::Bind(&Context::RunCommandLineApplication, 118 base::Bind(&Context::RunCommandLineApplication,
116 base::Unretained(&shell_context), base::Closure())); 119 base::Unretained(&shell_context), base::Closure()));
117 message_loop.Run(); 120 message_loop.Run();
118 121
119 // Must be called before |message_loop| is destroyed. 122 // Must be called before |message_loop| is destroyed.
120 shell_context.Shutdown(); 123 shell_context.Shutdown();
121 } 124 }
122 125
123 if (g_tracing) 126 if (g_tracing)
124 StopTracingAndFlushToDisk(); 127 StopTracingAndFlushToDisk();
125 return 0; 128 return 0;
126 } 129 }
127 130
128 } // namespace runner 131 } // namespace runner
129 } // namespace mojo 132 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/runner/context.cc ('k') | mojo/runner/in_process_native_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698