Merge 114213 - Fixes for the kWasRestarted pref.

chrome/browser/ui/browser_list.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_LIST_H_
 #define CHROME_BROWSER_UI_BROWSER_LIST_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 97 matching lines @@
   // The browser can be automatically restarted when:
   // 1. It's in the background mode (no visible windows).
   // 2. An update exe is present in the install folder.
   static bool CanRestartForUpdate();
 
   // Starts a user initiated exit process. Called from Browser::Exit.
   // On platforms other than ChromeOS, this is equivalent to
   // CloseAllBrowsersAndExit. On ChromeOS, this tells session manager
   // that chrome is signing out, which lets session manager send
   // SIGTERM to start actual exit process.
-  static void AttemptUserExit(bool restart);
+  static void AttemptUserExit();
 
   // Starts a user initiated restart process. On platforms other than
   // chromeos, this sets a restart bit in the preference so that
   // chrome will be restarted at the end of shutdown process. On
   // ChromeOS, this simply exits the chrome, which lets sesssion
   // manager re-launch the browser with restore last session flag.
   static void AttemptRestart();
 
   // Attempt to exit by closing all browsers.  This is equivalent to
   // CloseAllBrowsers() on platforms where the application exits
   // when no more windows are remaining. On other platforms (the Mac),
   // this will additionally exit the application if all browsers are
   // successfully closed.
   //  Note that he exit process may be interrupted by download or
   // unload handler, and the browser may or may not exit.
-  static void AttemptExit(bool restart);
+  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
 
@@ skipping 58 matching lines @@
   // For ChromeOS, also request session manager to end the session.
   static void NotifyAndTerminate(bool fast_path);
 
   // Called once there are no more browsers open and the application is exiting.
   static void AllBrowsersClosedAndAppExiting();
 
  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 AttemptExitInternal(bool restart);
+  static void AttemptExitInternal();
 
   // Counter of calls to StartKeepAlive(). If non-zero, the application will
   // continue running after the last browser has exited.
   static int keep_alive_count_;
 };
 
 class TabContentsWrapper;
 
 // Iterates through all web view hosts in all browser windows. Because the
 // renderers act asynchronously, getting a host through this interface does
@@ skipping 58 matching lines @@
   // iterator over the TabContentsWrappers doing background printing.
   std::set<TabContentsWrapper*>::const_iterator bg_printing_iterator_;
 
   // Current TabContents, or NULL if we're at the end of the list. This can
   // be extracted given the browser iterator and index, but it's nice to cache
   // this since the caller may access the current host many times.
   TabContentsWrapper* cur_;
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_LIST_H_