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

Side by Side Diff: chrome/nacl/nacl_exe_win_64.cc

Issue 9348114: Windows hack: use "/subsystem:console" to get stdout/stderr output Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/process_util.h" 9 #include "base/process_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 23 matching lines...) Expand all
34 34
35 base::SystemMonitor system_monitor; 35 base::SystemMonitor system_monitor;
36 HighResolutionTimerManager hi_res_timer_manager; 36 HighResolutionTimerManager hi_res_timer_manager;
37 37
38 NaClBrokerListener listener; 38 NaClBrokerListener listener;
39 listener.Listen(); 39 listener.Listen();
40 40
41 return 0; 41 return 0;
42 } 42 }
43 43
44 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { 44 //int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
45 int main() {
45 sandbox::SandboxInterfaceInfo sandbox_info = {0}; 46 sandbox::SandboxInterfaceInfo sandbox_info = {0};
46 content::InitializeSandboxInfo(&sandbox_info); 47 content::InitializeSandboxInfo(&sandbox_info);
47 48
48 base::AtExitManager exit_manager; 49 base::AtExitManager exit_manager;
49 CommandLine::Init(0, NULL); 50 CommandLine::Init(0, NULL);
50 51
51 wchar_t path[MAX_PATH]; 52 wchar_t path[MAX_PATH];
52 ::GetModuleFileNameW(NULL, path, MAX_PATH); 53 ::GetModuleFileNameW(NULL, path, MAX_PATH);
53 InitCrashReporterWithDllPath(std::wstring(path)); 54 InitCrashReporterWithDllPath(std::wstring(path));
54 55
(...skipping 17 matching lines...) Expand all
72 73
73 if (process_type == switches::kNaClLoaderProcess) 74 if (process_type == switches::kNaClLoaderProcess)
74 return NaClMain(main_params); 75 return NaClMain(main_params);
75 76
76 if (process_type == switches::kNaClBrokerProcess) 77 if (process_type == switches::kNaClBrokerProcess)
77 return NaClBrokerMain(main_params); 78 return NaClBrokerMain(main_params);
78 79
79 CHECK(false) << "Unknown NaCl 64 process."; 80 CHECK(false) << "Unknown NaCl 64 process.";
80 return -1; 81 return -1;
81 } 82 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698