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

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

Issue 7084010: Move sandbox_policy to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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
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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/system_monitor/system_monitor.h" 14 #include "base/system_monitor/system_monitor.h"
15 #include "chrome/common/chrome_constants.h" 15 #include "chrome/common/chrome_constants.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/logging_chrome.h" 17 #include "chrome/common/logging_chrome.h"
18 #include "chrome/common/sandbox_policy.h"
19 #include "chrome/nacl/nacl_launcher_thread.h" 18 #include "chrome/nacl/nacl_launcher_thread.h"
20 #include "chrome/nacl/nacl_main_platform_delegate.h" 19 #include "chrome/nacl/nacl_main_platform_delegate.h"
21 #include "content/common/child_process.h" 20 #include "content/common/child_process.h"
22 #include "content/common/hi_res_timer_manager.h" 21 #include "content/common/hi_res_timer_manager.h"
23 #include "content/common/main_function_params.h" 22 #include "content/common/main_function_params.h"
24 #include "content/common/result_codes.h" 23 #include "content/common/result_codes.h"
24 #include "content/common/sandbox_policy.h"
25 25
26 #if defined(OS_WIN) 26 #if defined(OS_WIN)
27 #include "chrome/nacl/broker_thread.h" 27 #include "chrome/nacl/broker_thread.h"
28 #include "sandbox/src/sandbox.h" 28 #include "sandbox/src/sandbox.h"
29 #endif 29 #endif
30 30
31 #ifdef _WIN64 31 #ifdef _WIN64
32 32
33 // main() routine for the NaCl broker process. 33 // main() routine for the NaCl broker process.
34 // This is necessary for supporting NaCl in Chrome on Win64. 34 // This is necessary for supporting NaCl in Chrome on Win64.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // require waiting for a timeout. 128 // require waiting for a timeout.
129 VLOG(1) << "Sandbox test failed: Not launching NaCl process"; 129 VLOG(1) << "Sandbox test failed: Not launching NaCl process";
130 } 130 }
131 #else 131 #else
132 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc."; 132 NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
133 #endif 133 #endif
134 134
135 platform.PlatformUninitialize(); 135 platform.PlatformUninitialize();
136 return 0; 136 return 0;
137 } 137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698