Index: chrome/browser/browser_shutdown.cc |
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc |
index 33c5ee6d82f5ac14f26ff0976e44b378db4f9b69..17f162f42dd1d2d22ebb02b3e7fa9b3180a49f12 100644 |
--- a/chrome/browser/browser_shutdown.cc |
+++ b/chrome/browser/browser_shutdown.cc |
@@ -352,6 +352,8 @@ void SetTryingToQuit(bool quitting) { |
if (quitting) |
return; |
+ g_shutdown_type = NOT_VALID; |
Alexey Seren
2017/04/09 17:51:37
reset shutdown state on browser close cancel
hashimoto
2017/04/14 08:54:37
I'm not sure if it's safe to allow cancelling shut
Alexey Seren
2017/04/22 19:52:54
You are right. It is not safe.
This CL https://cod
|
+ |
// Reset the restart-related preferences. They get set unconditionally through |
// calls such as chrome::AttemptRestart(), and need to be reset if the restart |
// attempt is cancelled. |