| Index: content/gpu/gpu_main.cc
|
| diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
|
| index 0bed8c28a8a942252c2343c88fd65fc795eecb60..aedf7a632371e3f5d3d061f6566d4b2b89fef0e3 100644
|
| --- a/content/gpu/gpu_main.cc
|
| +++ b/content/gpu/gpu_main.cc
|
| @@ -99,23 +99,18 @@ int GpuMain(const MainFunctionParams& parameters) {
|
|
|
| base::Time start_time = base::Time::Now();
|
|
|
| - bool in_browser_process = command_line.HasSwitch(switches::kSingleProcess) ||
|
| - command_line.HasSwitch(switches::kInProcessGPU);
|
| -
|
| - if (!in_browser_process) {
|
| #if defined(OS_WIN)
|
| - // Prevent Windows from displaying a modal dialog on failures like not being
|
| - // able to load a DLL.
|
| - SetErrorMode(
|
| - SEM_FAILCRITICALERRORS |
|
| - SEM_NOGPFAULTERRORBOX |
|
| - SEM_NOOPENFILEERRORBOX);
|
| + // Prevent Windows from displaying a modal dialog on failures like not being
|
| + // able to load a DLL.
|
| + SetErrorMode(
|
| + SEM_FAILCRITICALERRORS |
|
| + SEM_NOGPFAULTERRORBOX |
|
| + SEM_NOOPENFILEERRORBOX);
|
| #elif defined(USE_X11)
|
| - ui::SetDefaultX11ErrorHandlers();
|
| + ui::SetDefaultX11ErrorHandlers();
|
| #endif
|
|
|
| - logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
|
| - }
|
| + logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
|
|
|
| if (command_line.HasSwitch(switches::kSupportsDualGpus)) {
|
| std::string types = command_line.GetSwitchValueASCII(
|
|
|