Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4170)

Unified Diff: chrome/app/chrome_exe_main_win.cc

Issue 10657024: Don't show the restart dialog in the GPU process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_exe_main_win.cc
diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc
index 5ddb6c3f607ca0e1db01f27049b7128532ecb910..a455e89b5ab230512aa69abe27d685f77bac8500 100644
--- a/chrome/app/chrome_exe_main_win.cc
+++ b/chrome/app/chrome_exe_main_win.cc
@@ -11,13 +11,20 @@
#include "chrome/app/client_util.h"
#include "chrome/app/metro_driver_win.h"
#include "content/public/app/startup_helper_win.h"
+#include "content/public/common/content_switches.h"
#include "content/public/common/result_codes.h"
#include "sandbox/src/sandbox_factory.h"
int RunChrome(HINSTANCE instance) {
bool exit_now = true;
// We restarted because of a previous crash. Ask user if we should relaunch.
- if (ShowRestartDialogIfCrashed(&exit_now)) {
+ // WE explicitly don't do this if we're a GPU process. See crbug.com/132119.
apatrick_chromium 2012/06/25 21:34:30 nit: WE->We
robertshield 2012/06/26 00:18:53 Done.
+ const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ std::string process_type =
+ command_line.GetSwitchValueASCII(switches::kProcessType);
cpu_(ooo_6.6-7.5) 2012/06/25 20:12:36 not opposed to the approach, but I wonder if it wo
robertshield 2012/06/26 00:18:53 Done.
+
+ if (process_type != switches::kGpuProcess &&
+ ShowRestartDialogIfCrashed(&exit_now)) {
if (exit_now)
return content::RESULT_CODE_NORMAL_EXIT;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698