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

Side by Side Diff: content/gpu/gpu_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/common/sandbox_policy.cc ('k') | content/plugin/DEPS » ('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 <stdlib.h> 5 #include <stdlib.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
(...skipping 12 matching lines...) Expand all
23 #include "content/gpu/gpu_process.h" 23 #include "content/gpu/gpu_process.h"
24 #include "content/public/common/content_client.h" 24 #include "content/public/common/content_client.h"
25 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
26 #include "content/public/common/main_function_params.h" 26 #include "content/public/common/main_function_params.h"
27 #include "crypto/hmac.h" 27 #include "crypto/hmac.h"
28 #include "ui/gl/gl_surface.h" 28 #include "ui/gl/gl_surface.h"
29 #include "ui/gl/gl_switches.h" 29 #include "ui/gl/gl_switches.h"
30 30
31 #if defined(OS_WIN) 31 #if defined(OS_WIN)
32 #include "content/common/gpu/media/dxva_video_decode_accelerator.h" 32 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
33 #include "sandbox/src/sandbox.h" 33 #include "sandbox/win/src/sandbox.h"
34 #endif 34 #endif
35 35
36 #if defined(USE_X11) 36 #if defined(USE_X11)
37 #include "ui/base/x/x11_util.h" 37 #include "ui/base/x/x11_util.h"
38 #endif 38 #endif
39 39
40 #if defined(OS_LINUX) 40 #if defined(OS_LINUX)
41 #include "content/public/common/sandbox_init.h" 41 #include "content/public/common/sandbox_init.h"
42 #endif 42 #endif
43 43
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 { 227 {
228 TRACE_EVENT0("gpu", "Run Message Loop"); 228 TRACE_EVENT0("gpu", "Run Message Loop");
229 main_message_loop.Run(); 229 main_message_loop.Run();
230 } 230 }
231 231
232 child_thread->StopWatchdog(); 232 child_thread->StopWatchdog();
233 233
234 return 0; 234 return 0;
235 } 235 }
OLDNEW
« no previous file with comments | « content/common/sandbox_policy.cc ('k') | content/plugin/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698