diff options
author | jorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 09:16:06 +0000 |
---|---|---|
committer | jorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 09:16:06 +0000 |
commit | df1116189c2ec9108e424851801b0a22f65bccde (patch) | |
tree | 780ce1c8528bdac6c5bde20adeaf9a35e733a2a3 /content/browser/gpu/gpu_process_host.cc | |
parent | 53d5f0f46dfcdadb4a3d35e145f37a2aaa8d9567 (diff) | |
download | chromium_src-df1116189c2ec9108e424851801b0a22f65bccde.zip chromium_src-df1116189c2ec9108e424851801b0a22f65bccde.tar.gz chromium_src-df1116189c2ec9108e424851801b0a22f65bccde.tar.bz2 |
Implement '--gpu-sandbox-failures-nonfatal' flag.
Also, move the flag to content:: instead of chromeos::.
BUG=327824
TEST=Chrome compiles, loads with and without the flag.
Review URL: https://codereview.chromium.org/189313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_process_host.cc')
-rw-r--r-- | content/browser/gpu/gpu_process_host.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index a797e76..dd81857 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -48,10 +48,6 @@ #include "ui/gfx/switches.h" #endif -#if defined(OS_CHROMEOS) -#include "chromeos/chromeos_switches.h" -#endif - #if defined(USE_OZONE) #include "ui/ozone/ozone_switches.h" #endif @@ -1093,6 +1089,7 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id) { switches::kEnableShareGroupAsyncTextureUpload, switches::kGpuStartupDialog, switches::kGpuSandboxAllowSysVShm, + switches::kGpuSandboxFailuresNonfatal, switches::kLoggingLevel, switches::kNoSandbox, switches::kTestGLLib, @@ -1102,9 +1099,6 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id) { #if defined(OS_MACOSX) switches::kEnableSandboxLogging, #endif -#if defined(OS_CHROMEOS) - chromeos::switches::kGpuSandboxFailuresNonfatal, -#endif #if defined(USE_OZONE) switches::kOzonePlatform, #endif |