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

Side by Side Diff: content/ppapi_plugin/ppapi_thread.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
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 "content/ppapi_plugin/ppapi_thread.h" 5 #include "content/ppapi_plugin/ppapi_thread.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 16 matching lines...) Expand all
27 #include "ppapi/c/pp_errors.h" 27 #include "ppapi/c/pp_errors.h"
28 #include "ppapi/c/ppp.h" 28 #include "ppapi/c/ppp.h"
29 #include "ppapi/proxy/plugin_globals.h" 29 #include "ppapi/proxy/plugin_globals.h"
30 #include "ppapi/proxy/ppapi_messages.h" 30 #include "ppapi/proxy/ppapi_messages.h"
31 #include "ppapi/proxy/interface_list.h" 31 #include "ppapi/proxy/interface_list.h"
32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
33 #include "ui/base/ui_base_switches.h" 33 #include "ui/base/ui_base_switches.h"
34 #include "webkit/plugins/plugin_switches.h" 34 #include "webkit/plugins/plugin_switches.h"
35 35
36 #if defined(OS_WIN) 36 #if defined(OS_WIN)
37 #include "sandbox/src/sandbox.h" 37 #include "sandbox/win/src/sandbox.h"
38 #elif defined(OS_MACOSX) 38 #elif defined(OS_MACOSX)
39 #include "content/common/sandbox_init_mac.h" 39 #include "content/common/sandbox_init_mac.h"
40 #endif 40 #endif
41 41
42 #if defined(OS_WIN) 42 #if defined(OS_WIN)
43 extern sandbox::TargetServices* g_target_services; 43 extern sandbox::TargetServices* g_target_services;
44 #else 44 #else
45 extern void* g_target_services; 45 extern void* g_target_services;
46 #endif 46 #endif
47 47
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 ppapi::proxy::PluginGlobals::Get()->set_plugin_name( 374 ppapi::proxy::PluginGlobals::Get()->set_plugin_name(
375 path.BaseName().AsUTF8Unsafe()); 375 path.BaseName().AsUTF8Unsafe());
376 376
377 // plugin() is NULL when in-process. Which is fine, because this is 377 // plugin() is NULL when in-process. Which is fine, because this is
378 // just a hook for setting the process name. 378 // just a hook for setting the process name.
379 if (content::GetContentClient()->plugin()) { 379 if (content::GetContentClient()->plugin()) {
380 content::GetContentClient()->plugin()->PluginProcessStarted( 380 content::GetContentClient()->plugin()->PluginProcessStarted(
381 path.BaseName().RemoveExtension().LossyDisplayName()); 381 path.BaseName().RemoveExtension().LossyDisplayName());
382 } 382 }
383 } 383 }
OLDNEW
« no previous file with comments | « content/ppapi_plugin/ppapi_plugin_main.cc ('k') | content/renderer/renderer_main_platform_delegate_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698