Index: chrome/browser/ui/browser_list.h |
diff --git a/chrome/browser/ui/browser_list.h b/chrome/browser/ui/browser_list.h |
index 1e0192438ea2061dd327c7d86848a8e09c65a680..509df205a4e8d38ce475e937511a9ca13a000920 100644 |
--- a/chrome/browser/ui/browser_list.h |
+++ b/chrome/browser/ui/browser_list.h |
@@ -127,21 +127,15 @@ class BrowserList { |
// unload handler, and the browser may or may not exit. |
static void AttemptExit(); |
-#if defined(OS_CHROMEOS) |
- // This is equivalent to AttemptUserExit, except that it always set |
- // exit cleanly bit. ChroemOS checks if it can exit without user |
- // interactions, so it will always exit the browser. This is used to |
- // handle SIGTERM on chromeos which is a signal to force shutdown |
- // the chrome. |
- static void ExitCleanly(); |
-#endif |
- |
// Closes all browsers. If the session is ending the windows are closed |
// directly. Otherwise the windows are closed by way of posting a WM_CLOSE |
// message. |
static void CloseAllBrowsers(); |
- // Begins shutdown of the application when the desktop session is ending. |
+ // Begins shutdown of the application when the desktop session is |
+ // ending. This first calls BrowserProcess::EndSession then force |
+ // closes browsers, therefore any crashes after EndSession won't be |
+ // included in UMA stats. |
static void SessionEnding(); |
// Returns true if there is at least one Browser with the specified profile. |
@@ -202,7 +196,7 @@ class BrowserList { |
private: |
// Helper method to remove a browser instance from a list of browsers |
static void RemoveBrowserFrom(Browser* browser, BrowserVector* browser_list); |
- static void MarkAsCleanShutdown(); |
+ static void MarkAsCleanShutdownInUserProfiles(); |
static void AttemptExitInternal(); |
static BrowserVector browsers_; |