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

Side by Side Diff: content/plugin/plugin_main.cc

Issue 1851213002: Remove sandbox on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nacl compile issues Created 4 years, 8 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 | « content/gpu/gpu_main.cc ('k') | content/ppapi_plugin/ppapi_plugin_main.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 "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/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/threading/platform_thread.h" 15 #include "base/threading/platform_thread.h"
16 #include "base/timer/hi_res_timer_manager.h" 16 #include "base/timer/hi_res_timer_manager.h"
17 #include "content/child/child_process.h" 17 #include "content/child/child_process.h"
18 #include "content/common/content_constants_internal.h" 18 #include "content/common/content_constants_internal.h"
19 #include "content/plugin/plugin_thread.h" 19 #include "content/plugin/plugin_thread.h"
20 #include "content/public/common/content_switches.h" 20 #include "content/public/common/content_switches.h"
21 #include "content/public/common/main_function_params.h" 21 #include "content/public/common/main_function_params.h"
22 22
23 #if defined(OS_WIN) 23 #if defined(OS_WIN)
24 #include "base/win/scoped_com_initializer.h" 24 #include "base/win/scoped_com_initializer.h"
25 #include "content/public/common/injection_test_win.h" 25 #include "content/public/common/injection_test_win.h"
26 #include "sandbox/win/src/sandbox.h"
27 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 26 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
28 #include "base/posix/global_descriptors.h" 27 #include "base/posix/global_descriptors.h"
29 #include "ipc/ipc_descriptors.h" 28 #include "ipc/ipc_descriptors.h"
30 #endif 29 #endif
31 30
32 namespace content { 31 namespace content {
33 32
34 #if defined(OS_MACOSX) 33 #if defined(OS_MACOSX)
35 // Initializes the global Cocoa application object. 34 // Initializes the global Cocoa application object.
36 void InitializeChromeApplication(); 35 void InitializeChromeApplication();
(...skipping 25 matching lines...) Expand all
62 ChildProcess plugin_process; 61 ChildProcess plugin_process;
63 plugin_process.set_main_thread(new PluginThread()); 62 plugin_process.set_main_thread(new PluginThread());
64 base::HighResolutionTimerManager hi_res_timer_manager; 63 base::HighResolutionTimerManager hi_res_timer_manager;
65 base::MessageLoop::current()->Run(); 64 base::MessageLoop::current()->Run();
66 } 65 }
67 66
68 return 0; 67 return 0;
69 } 68 }
70 69
71 } // namespace content 70 } // namespace content
OLDNEW
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/ppapi_plugin/ppapi_plugin_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698