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

Side by Side Diff: remoting/host/host_main.cc

Issue 2451203002: Revert of Use ChannelMojo between the remoting daemon and network processes. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « remoting/host/daemon_process_win.cc ('k') | remoting/host/remoting_me2me_host.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 // This file implements the common entry point shared by all Chromoting Host 5 // This file implements the common entry point shared by all Chromoting Host
6 // processes. 6 // processes.
7 7
8 #include "remoting/host/host_main.h" 8 #include "remoting/host/host_main.h"
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/at_exit.h" 12 #include "base/at_exit.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/i18n/icu_util.h" 15 #include "base/i18n/icu_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/strings/stringize_macros.h" 18 #include "base/strings/stringize_macros.h"
19 #include "base/strings/stringprintf.h" 19 #include "base/strings/stringprintf.h"
20 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "build/build_config.h" 21 #include "build/build_config.h"
22 #include "mojo/edk/embedder/embedder.h"
23 #include "remoting/base/breakpad.h" 22 #include "remoting/base/breakpad.h"
24 #include "remoting/host/host_exit_codes.h" 23 #include "remoting/host/host_exit_codes.h"
25 #include "remoting/host/logging.h" 24 #include "remoting/host/logging.h"
26 #include "remoting/host/resources.h" 25 #include "remoting/host/resources.h"
27 #include "remoting/host/setup/me2me_native_messaging_host.h" 26 #include "remoting/host/setup/me2me_native_messaging_host.h"
28 #include "remoting/host/switches.h" 27 #include "remoting/host/switches.h"
29 #include "remoting/host/usage_stats_consent.h" 28 #include "remoting/host/usage_stats_consent.h"
30 29
31 #if defined(OS_MACOSX) 30 #if defined(OS_MACOSX)
32 #include "base/mac/scoped_nsautorelease_pool.h" 31 #include "base/mac/scoped_nsautorelease_pool.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 process_type.c_str()); 204 process_type.c_str());
206 Usage(command_line->GetProgram()); 205 Usage(command_line->GetProgram());
207 return kInvalidCommandLineExitCode; 206 return kInvalidCommandLineExitCode;
208 } 207 }
209 208
210 // Required to find the ICU data file, used by some file_util routines. 209 // Required to find the ICU data file, used by some file_util routines.
211 base::i18n::InitializeICU(); 210 base::i18n::InitializeICU();
212 211
213 remoting::LoadResources(""); 212 remoting::LoadResources("");
214 213
215 #if defined(REMOTING_MULTI_PROCESS)
216 mojo::edk::Init();
217 #endif
218
219 // Invoke the entry point. 214 // Invoke the entry point.
220 int exit_code = main_routine(); 215 int exit_code = main_routine();
221 if (exit_code == kInvalidCommandLineExitCode) { 216 if (exit_code == kInvalidCommandLineExitCode) {
222 Usage(command_line->GetProgram()); 217 Usage(command_line->GetProgram());
223 } 218 }
224 219
225 remoting::UnloadResources(); 220 remoting::UnloadResources();
226 221
227 return exit_code; 222 return exit_code;
228 } 223 }
229 224
230 } // namespace remoting 225 } // namespace remoting
231 226
232 #if !defined(OS_WIN) 227 #if !defined(OS_WIN)
233 int main(int argc, char** argv) { 228 int main(int argc, char** argv) {
234 return remoting::HostMain(argc, argv); 229 return remoting::HostMain(argc, argv);
235 } 230 }
236 #endif // !defined(OS_WIN) 231 #endif // !defined(OS_WIN)
OLDNEW
« no previous file with comments | « remoting/host/daemon_process_win.cc ('k') | remoting/host/remoting_me2me_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698