diff options
| author | jorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 04:20:41 +0000 |
|---|---|---|
| committer | jorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 04:20:41 +0000 |
| commit | 1e6ef6c000c406a2c7980bd527068a18327a808e (patch) | |
| tree | a69df9f7db448e212c745d09b68927dc3558b939 /content | |
| parent | 4f92bd1b131a43aac7a57ce684722557ab47c275 (diff) | |
| download | chromium_src-1e6ef6c000c406a2c7980bd527068a18327a808e.zip chromium_src-1e6ef6c000c406a2c7980bd527068a18327a808e.tar.gz chromium_src-1e6ef6c000c406a2c7980bd527068a18327a808e.tar.bz2 | |
Add a flag to make GPU sandbox failures nonfatal.
BUG=327824
TEST=chromeos=1 compiles, loads.
Review URL: https://codereview.chromium.org/117463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/gpu/gpu_process_host.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 1b7da1c..3d0544d 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -48,6 +48,10 @@ #include "ui/surface/accelerated_surface_win.h" #endif +#if defined(OS_CHROMEOS) +#include "chromeos/chromeos_switches.h" +#endif + #if defined(USE_OZONE) #include "ui/ozone/ozone_switches.h" #endif @@ -1133,6 +1137,9 @@ 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_AURA) switches::kUIPrioritizeInGpuProcess, #endif |