diff options
| -rw-r--r-- | content/browser/gpu_process_host.cc | 1 | ||||
| -rw-r--r-- | content/common/content_switches.cc | 3 | ||||
| -rw-r--r-- | content/common/content_switches.h | 1 | ||||
| -rw-r--r-- | content/gpu/gpu_child_thread.cc | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/content/browser/gpu_process_host.cc b/content/browser/gpu_process_host.cc index f606303..2b434fed 100644 --- a/content/browser/gpu_process_host.cc +++ b/content/browser/gpu_process_host.cc @@ -226,7 +226,6 @@ bool GpuProcessHost::LaunchGpuProcess() { #endif switches::kGpuStartupDialog, switches::kLoggingLevel, - switches::kNoGpuSandbox, switches::kNoSandbox, switches::kDisableGLMultisampling, }; diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc index 76ce3bd..be9a3f0 100644 --- a/content/common/content_switches.cc +++ b/content/common/content_switches.cc @@ -142,9 +142,6 @@ const char kLogPluginMessages[] = "log-plugin-messages"; // Causes the process to run as a NativeClient loader. const char kNaClLoaderProcess[] = "nacl-loader"; -// Don't Sandbox the GPU process, does not affect other sandboxed processes. -const char kNoGpuSandbox[] = "no-gpu-sandbox"; - // Don't send HTTP-Referer headers. const char kNoReferrers[] = "no-referrers"; diff --git a/content/common/content_switches.h b/content/common/content_switches.h index b1d5857..63bf1ab 100644 --- a/content/common/content_switches.h +++ b/content/common/content_switches.h @@ -52,7 +52,6 @@ extern const char kLoggingLevel[]; extern const char kLogPluginMessages[]; // TODO(jam): this doesn't belong in content. extern const char kNaClLoaderProcess[]; -extern const char kNoGpuSandbox[]; extern const char kNoReferrers[]; extern const char kNoSandbox[]; extern const char kPluginLauncher[]; diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index da22791..98b6346 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -133,7 +133,7 @@ void GpuChildThread::OnInitialize() { #if defined (OS_MACOSX) // Note that kNoSandbox will also disable the GPU sandbox. bool no_gpu_sandbox = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kNoGpuSandbox); + switches::kDisableGpuSandbox); if (!no_gpu_sandbox) { if (!InitializeGpuSandbox()) { LOG(ERROR) << "Failed to initialize the GPU sandbox"; |