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

Side by Side Diff: content/ppapi_plugin/ppapi_plugin_main.cc

Issue 10689170: Move the Windows sandbox to sandbox/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on top of tree (properly this time) Created 8 years, 5 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 | « content/plugin/plugin_main.cc ('k') | content/ppapi_plugin/ppapi_thread.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/debug/debugger.h" 6 #include "base/debug/debugger.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/common/child_process.h" 10 #include "content/common/child_process.h"
11 #include "content/ppapi_plugin/ppapi_thread.h" 11 #include "content/ppapi_plugin/ppapi_thread.h"
12 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
13 #include "content/public/common/main_function_params.h" 13 #include "content/public/common/main_function_params.h"
14 #include "ppapi/proxy/proxy_module.h" 14 #include "ppapi/proxy/proxy_module.h"
15 15
16 #if defined(OS_WIN) 16 #if defined(OS_WIN)
17 #include "sandbox/src/sandbox.h" 17 #include "sandbox/win/src/sandbox.h"
18 #endif 18 #endif
19 19
20 #if defined(OS_LINUX) 20 #if defined(OS_LINUX)
21 #include "content/public/common/sandbox_init.h" 21 #include "content/public/common/sandbox_init.h"
22 #endif 22 #endif
23 23
24 #if defined(OS_WIN) 24 #if defined(OS_WIN)
25 sandbox::TargetServices* g_target_services = NULL; 25 sandbox::TargetServices* g_target_services = NULL;
26 #else 26 #else
27 void* g_target_services = 0; 27 void* g_target_services = 0;
(...skipping 24 matching lines...) Expand all
52 content::InitializeSandbox(); 52 content::InitializeSandbox();
53 #endif 53 #endif
54 54
55 ChildProcess ppapi_process; 55 ChildProcess ppapi_process;
56 ppapi_process.set_main_thread( 56 ppapi_process.set_main_thread(
57 new PpapiThread(parameters.command_line, false)); // Not a broker. 57 new PpapiThread(parameters.command_line, false)); // Not a broker.
58 58
59 main_message_loop.Run(); 59 main_message_loop.Run();
60 return 0; 60 return 0;
61 } 61 }
OLDNEW
« no previous file with comments | « content/plugin/plugin_main.cc ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698