diff options
| -rw-r--r-- | chrome/browser/chromeos/login/chrome_restart_request.cc | 1 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.cc | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_process_host.cc | 7 |
4 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc index 1f54955..abc37ee 100644 --- a/chrome/browser/chromeos/login/chrome_restart_request.cc +++ b/chrome/browser/chromeos/login/chrome_restart_request.cc @@ -196,6 +196,7 @@ std::string DeriveCommandLine(const GURL& start_url, chromeos::switches::kDbusStub, chromeos::switches::kDisableLoginAnimations, chromeos::switches::kDisableOobeAnimation, + chromeos::switches::kGpuSandboxFailuresNonfatal, chromeos::switches::kHasChromeOSDiamondKey, chromeos::switches::kHasChromeOSKeyboard, chromeos::switches::kLoginProfile, diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index f5eb505..4da5167 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -136,6 +136,9 @@ const char kFirstExecAfterBoot[] = "first-exec-after-boot"; // tests can change how it's brought up. This flag disables that. const char kForceLoginManagerInTests[] = "force-login-manager-in-tests"; +// Makes GPU sandbox failures nonfatal. +const char kGpuSandboxFailuresNonfatal[] = "gpu-sandbox-failures-nonfatal"; + // Indicates that the browser is in "browse without sign-in" (Guest session) // mode. Should completely disable extensions, sync and bookmarks. const char kGuestSession[] = "bwsi"; diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 85c1e67..142f22a 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -54,6 +54,7 @@ CHROMEOS_EXPORT extern const char kFileManagerShowCheckboxes[]; CHROMEOS_EXPORT extern const char kFileManagerEnableWebstoreIntegration[]; CHROMEOS_EXPORT extern const char kFirstExecAfterBoot[]; CHROMEOS_EXPORT extern const char kForceLoginManagerInTests[]; +CHROMEOS_EXPORT extern const char kGpuSandboxFailuresNonfatal[]; CHROMEOS_EXPORT extern const char kGuestSession[]; CHROMEOS_EXPORT extern const char kHasChromeOSDiamondKey[]; CHROMEOS_EXPORT extern const char kHasChromeOSKeyboard[]; 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 |