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

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

Issue 10783004: Move Windows Sandbox, trybots version (don't commit me!) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to top of tree 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/DEPS ('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 <objbase.h> 8 #include <objbase.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/hi_res_timer_manager.h" 14 #include "base/hi_res_timer_manager.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/system_monitor/system_monitor.h" 17 #include "base/system_monitor/system_monitor.h"
18 #include "base/threading/platform_thread.h" 18 #include "base/threading/platform_thread.h"
19 #include "content/common/child_process.h" 19 #include "content/common/child_process.h"
20 #include "content/plugin/plugin_thread.h" 20 #include "content/plugin/plugin_thread.h"
21 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
22 #include "content/public/common/main_function_params.h" 22 #include "content/public/common/main_function_params.h"
23 23
24 #if defined(OS_WIN) 24 #if defined(OS_WIN)
25 #include "content/common/injection_test_dll.h" 25 #include "content/common/injection_test_dll.h"
26 #include "sandbox/src/sandbox.h" 26 #include "sandbox/win/src/sandbox.h"
27 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 27 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
28 #include "base/global_descriptors_posix.h" 28 #include "base/global_descriptors_posix.h"
29 #include "ipc/ipc_descriptors.h" 29 #include "ipc/ipc_descriptors.h"
30 #endif 30 #endif
31 31
32 #if defined(OS_MACOSX) 32 #if defined(OS_MACOSX)
33 // Removes our Carbon library interposing from the environment so that it 33 // Removes our Carbon library interposing from the environment so that it
34 // doesn't carry into any processes that plugins might start. 34 // doesn't carry into any processes that plugins might start.
35 void TrimInterposeEnvironment(); 35 void TrimInterposeEnvironment();
36 36
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 MessageLoop::current()->Run(); 221 MessageLoop::current()->Run();
222 } 222 }
223 223
224 #if defined(OS_WIN) 224 #if defined(OS_WIN)
225 DestroyIMEForFlash(); 225 DestroyIMEForFlash();
226 CoUninitialize(); 226 CoUninitialize();
227 #endif 227 #endif
228 228
229 return 0; 229 return 0;
230 } 230 }
OLDNEW
« no previous file with comments | « content/plugin/DEPS ('k') | content/ppapi_plugin/ppapi_plugin_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698