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

Unified Diff: content/ppapi_plugin/ppapi_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, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/plugin/plugin_main.cc ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/ppapi_plugin/ppapi_plugin_main.cc
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index fccb830e7cbbfdfbbc527e3bbb9ae73fa09a6ae0..94c47172b2cfcd935e4037ab2e36ebf59ba5c116 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -29,7 +29,7 @@
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
#include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
-#include "sandbox/win/src/sandbox.h"
+#include "content/child/font_warmup_win.h"
#include "third_party/WebKit/public/web/win/WebFontRendering.h"
#include "third_party/skia/include/ports/SkTypeface_win.h"
#include "ui/gfx/win/direct_write.h"
@@ -48,11 +48,7 @@
#include <stdlib.h>
#endif
-#if defined(OS_WIN)
-sandbox::TargetServices* g_target_services = NULL;
-#else
void* g_target_services = 0;
-#endif
namespace content {
@@ -72,10 +68,6 @@ void SkiaPreCacheFont(const LOGFONT& logfont) {
int PpapiPluginMain(const MainFunctionParams& parameters) {
const base::CommandLine& command_line = parameters.command_line;
-#if defined(OS_WIN)
- g_target_services = parameters.sandbox_info->target_services;
-#endif
-
// If |g_target_services| is not null this process is sandboxed. One side
// effect is that we can't pop dialogs like ChildProcess::WaitForDebugger()
// does.
« 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