ChromeOs: Call BrowserList::SessionEnding when shutting down via SIGTERM

chrome/browser/ui/browser_list.cc

 // 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.
 
 #include "chrome/browser/ui/browser_list.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
@@ skipping 237 matching lines @@
 
   // Send out notifications after add has occurred. Do some basic checking to
   // try to catch evil observers that change the list from under us.
   size_t original_count = observers_.size();
   FOR_EACH_OBSERVER(Observer, observers_, OnBrowserAdded(browser));
   DCHECK_EQ(original_count, observers_.size())
       << "observer list modified during notification";
 }
 
 // static
-void BrowserList::MarkAsCleanShutdown() {
+void BrowserList::MarkAsCleanShutdownInUserProfiles() {
   for (const_iterator i = begin(); i != end(); ++i) {
     (*i)->profile()->MarkAsCleanShutdown();
   }
 }
 
 void BrowserList::AttemptExitInternal() {
   NotificationService::current()->Notify(
       NotificationType::APP_EXITING,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
 
 #if !defined(OS_MACOSX)
   // On most platforms, closing all windows causes the application to exit.
   CloseAllBrowsers();
 #else
   // On the Mac, the application continues to run once all windows are closed.
   // Terminate will result in a CloseAllBrowsers() call, and once (and if)
   // that is done, will cause the application to exit cleanly.
   chrome_browser_application_mac::Terminate();
 #endif
 }
 
 // static
 void BrowserList::NotifyAndTerminate(bool fast_path) {
 #if defined(OS_CHROMEOS)
-  if (!signout) return;
-  NotifyWindowManagerAboutSignout();
+  if (!signout)
+    return;
 #endif
 
   if (fast_path) {
     NotificationService::current()->Notify(NotificationType::APP_TERMINATING,
                                            NotificationService::AllSources(),
                                            NotificationService::NoDetails());
   }
 
 #if defined(OS_CHROMEOS)
+  NotifyWindowManagerAboutSignout();
   chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
   if (cros_library->EnsureLoaded()) {
     // If update has been installed, reboot, otherwise, sign out.
     if (cros_library->GetUpdateLibrary()->status().status ==
           chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
       cros_library->GetUpdateLibrary()->RebootAfterUpdate();
     } else {
       cros_library->GetLoginLibrary()->StopSession("");
     }
     return;
@@ skipping 57 matching lines @@
 }
 
 // static
 void BrowserList::RemoveObserver(BrowserList::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 // static
 void BrowserList::CloseAllBrowsers() {
   bool session_ending =
       browser_shutdown::GetShutdownType() == browser_shutdown::END_SESSION;

[achuithb, 2011/06/29 20:46:57]

session_ending is true when this function is called from SessionEnding().

   bool force_exit = false;
 #if defined(USE_X11)
   if (session_ending)
     force_exit = true;

[achuithb, 2011/06/29 20:46:57]

force_exit is true

 #endif
   // Tell everyone that we are shutting down.
   browser_shutdown::SetTryingToQuit(true);
 
   // Before we close the browsers shutdown all session services. That way an
   // exit can restore all browsers open before exiting.
   ProfileManager::ShutdownSessionServices();
 
   // If there are no browsers, send the APP_TERMINATING action here. Otherwise,
   // it will be sent by RemoveBrowser() when the last browser has closed.
   if (force_exit || browsers_.empty()) {
     NotifyAndTerminate(true);
     return;

[achuithb, 2011/06/29 20:46:57]

We return here because force_exit is true. None of the browser windows are
actually closed.

   }
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker(
       "StartedClosingWindows", false);
 #endif
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end();) {
     Browser* browser = *i;
     browser->window()->Close();
     if (!session_ending) {
@@ skipping 29 matching lines @@
   chromeos::BootTimesLoader::Get()->RecordCurrentStats(kLogoutStarted);
 
   // Login screen should show up in owner's locale.
   PrefService* state = g_browser_process->local_state();
   if (state) {
     std::string owner_locale = state->GetString(prefs::kOwnerLocale);
     if (!owner_locale.empty() &&
         state->GetString(prefs::kApplicationLocale) != owner_locale &&
         !state->IsManagedPreference(prefs::kApplicationLocale)) {
       state->SetString(prefs::kApplicationLocale, owner_locale);
-      state->ScheduleSavePersistentPrefs();
+      state->SavePersistentPrefs();
     }
   }
-  if (FastShutdown()) {
+  if (FastShutdown())
     return;
-  }
 #else
   // Reset the restart bit that might have been set in cancelled restart
   // request.
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, false);
 #endif
   AttemptExitInternal();
 }
 
 // static
 void BrowserList::AttemptRestart() {
 #if defined(OS_CHROMEOS)
   // For CrOS instead of browser restart (which is not supported) perform a full
   // sign out. Session will be only restored if user has that setting set.
   // Same session restore behavior happens in case of full restart after update.
   AttemptUserExit();
 #else
   // Set the flag to restore state after the restart.
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
   AttemptExit();
 #endif
 }
 
 // static
 void BrowserList::AttemptExit() {
   // If we know that all browsers can be closed without blocking,
-  // don't notify users of crashes beyond this point.
-  // Note that MarkAsCleanShutdown does not set UMA's exit cleanly bit
-  // so crashes during shutdown are still reported in UMA.
+  // don't notify users of crashes beyond this point.  Note that
+  // MarkAsCleanShutdownInUserProfiles does not set UMA's exit cleanly
+  // bit so crashes during shutdown are still reported in UMA.
   if (AreAllBrowsersCloseable())
-    MarkAsCleanShutdown();
+    MarkAsCleanShutdownInUserProfiles();
   AttemptExitInternal();
 }
 
-#if defined(OS_CHROMEOS)
-// static
-void BrowserList::ExitCleanly() {
-  // We always mark exit cleanly.
-  MarkAsCleanShutdown();
-  AttemptExitInternal();
-}
-#endif
-
 // static
 void BrowserList::SessionEnding() {
   // EndSession is invoked once per frame. Only do something the first time.
   static bool already_ended = false;
   // We may get called in the middle of shutdown, e.g. http://crbug.com/70852
   // In this case, do nothing.
   if (already_ended || !NotificationService::current())
     return;
   already_ended = true;
 
   browser_shutdown::OnShutdownStarting(browser_shutdown::END_SESSION);

[achuithb, 2011/06/29 20:46:57]

We set shutdown_type to END_SESSION here.

 
   NotificationService::current()->Notify(
       NotificationType::APP_EXITING,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
 
   // Write important data first.
   g_browser_process->EndSession();
 
   BrowserList::CloseAllBrowsers();

[achuithb, 2011/06/29 20:46:57]

This doesn't actually close any browser windows, as far as I can tell.

 
   // Send out notification. This is used during testing so that the test harness
   // can properly shutdown before we exit.
   NotificationService::current()->Notify(
       NotificationType::SESSION_END,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
 
   // And shutdown.
   browser_shutdown::Shutdown();
@@ skipping 206 matching lines @@
   // If no more TabContents from Browsers, check the BackgroundPrintingManager.
   while (bg_printing_iterator_ != GetBackgroundPrintingManager()->end()) {
     cur_ = *bg_printing_iterator_;
     CHECK(cur_);
     ++bg_printing_iterator_;
     return;
   }
   // Reached the end - no more TabContents.
   cur_ = NULL;
 }