chromeos: Notify window manager earlier about signout.

chrome/browser/ui/browser_list.cc

 // Copyright (c) 2010 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/browser_list.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
@@ skipping 142 matching lines @@
       return *i;
   }
   return NULL;
 }
 
 }  // namespace
 
 BrowserList::BrowserVector BrowserList::browsers_;
 ObserverList<BrowserList::Observer> BrowserList::observers_;
 
+#if defined(OS_CHROMEOS)
+bool BrowserList::notified_window_manager_about_signout_ = false;
+#endif
+
 // static
 void BrowserList::AddBrowser(Browser* browser) {
   DCHECK(browser);
   browsers_.push_back(browser);
 
   g_browser_process->AddRefModule();
 
   if (!activity_observer)
     activity_observer = new BrowserActivityObserver;
 
   NotificationService::current()->Notify(
       NotificationType::BROWSER_OPENED,
       Source<Browser>(browser),
       NotificationService::NoDetails());
 
   // 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::NotifyAndTerminate() {
+#if defined(OS_CHROMEOS)
+  // Let the window manager know that we're going away before we start closing
+  // windows so it can display a graceful transition to a black screen.
+  chromeos::WmIpc::instance()->NotifyAboutSignout();
+  notified_window_manager_about_signout_ = true;
+#endif
   NotificationService::current()->Notify(NotificationType::APP_TERMINATING,
                                          NotificationService::AllSources(),
                                          NotificationService::NoDetails());
 #if defined(OS_CHROMEOS)
-  chromeos::WmIpc::instance()->NotifyAboutSignout();
   if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
     chromeos::CrosLibrary::Get()->GetLoginLibrary()->StopSession("");
     return;
   }
   // If running the Chrome OS build, but we're not on the device, fall through
 #endif
   AllBrowsersClosedAndAppExiting();
 }
 
 // static
@@ skipping 25 matching lines @@
     activity_observer = NULL;
   }
 
   g_browser_process->ReleaseModule();
 
   // If we're exiting, send out the APP_TERMINATING notification to allow other
   // modules to shut themselves down.
   if (browsers_.empty() &&
       (browser_shutdown::IsTryingToQuit() ||
        g_browser_process->IsShuttingDown())) {
+#if defined(OS_CHROMEOS)
+    // We might've already notified the window manager before closing any
+    // windows in NotifyAndTerminate() if we were able to take the
+    // no-beforeunload-handlers-or-downloads fast path; no need to do it again
+    // here.
+    if (!notified_window_manager_about_signout_) {
+      chromeos::WmIpc::instance()->NotifyAboutSignout();
+      notified_window_manager_about_signout_ = true;
+    }
+#endif
     // Last browser has just closed, and this is a user-initiated quit or there
     // is no module keeping the app alive, so send out our notification. No need
     // to call ProfileManager::ShutdownSessionServices() as part of the
     // shutdown, because Browser::WindowClosing() already makes sure that the
     // SessionService is created and notified.
     NotificationService::current()->Notify(NotificationType::APP_TERMINATING,
                                            NotificationService::AllSources(),
                                            NotificationService::NoDetails());
     AllBrowsersClosedAndAppExiting();
   }
@@ skipping 344 matching lines @@
     }
 
     TabContents* next_tab =
         (*browser_iterator_)->GetTabContentsAt(web_view_index_);
     if (next_tab) {
       cur_ = next_tab;
       return;
     }
   }
 }