Display "Restart to update" dialog to Chrome OS users.

chrome/browser/lifetime/application_lifetime.cc

 // Copyright (c) 2012 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/lifetime/application_lifetime.h"
 
 #include <memory>
 #include <string>
 
 #if defined(OS_WIN)
@@ skipping 114 matching lines @@
   // Tell everyone that we are shutting down.
   browser_shutdown::SetTryingToQuit(true);
 
 #if BUILDFLAG(ENABLE_SESSION_SERVICE)
   // If ShuttingDownWithoutClosingBrowsers() returns true, the session
   // services may not get a chance to shut down normally, so explicitly shut
   // them down here to ensure they have a chance to persist their data.
   ProfileManager::ShutdownSessionServices();
 #endif
 
-  chrome::NotifyAndTerminate(true);
+  chrome::NotifyAndTerminate(/*fast_path=*/true,/*always_reboot=*/false);

[James Cook, 2016/11/30 23:01:41]

ditto, and throughout

[Greg K, 2016/12/01 19:44:43]

Done.

   chrome::OnAppExiting();
 }
 
 void CloseAllBrowsers() {
   // If there are no browsers and closing the last browser would quit the
   // application, send the APP_TERMINATING action here. Otherwise, it will be
   // sent by RemoveBrowser() when the last browser has closed.
   if (chrome::GetTotalBrowserCount() == 0 &&
       (browser_shutdown::IsTryingToQuit() ||
        !KeepAliveRegistry::GetInstance()->IsKeepingAlive())) {
@@ skipping 28 matching lines @@
         state->GetString(prefs::kApplicationLocale) != owner_locale &&
         !state->IsManagedPreference(prefs::kApplicationLocale)) {
       state->SetString(prefs::kApplicationLocale, owner_locale);
       TRACE_EVENT0("shutdown", "CommitPendingWrite");
       state->CommitPendingWrite();
     }
   }
   g_send_stop_request_to_session_manager = true;
   // On ChromeOS, always terminate the browser, regardless of the result of
   // AreAllBrowsersCloseable(). See crbug.com/123107.
-  chrome::NotifyAndTerminate(true);
+  chrome::NotifyAndTerminate(/*fast_path=*/true,/*always_reboot=*/false);
 #else
   // Reset the restart bit that might have been set in cancelled restart
   // request.
 #if !defined(OS_ANDROID)
   UserManager::Hide();
 #endif
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, false);
   AttemptExitInternal(false);
 #endif  // defined(OS_CHROMEOS)
@@ skipping 155 matching lines @@
   static bool notified = false;
   if (notified)
     return;
   notified = true;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_APP_TERMINATING,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 }
 
-void NotifyAndTerminate(bool fast_path) {
+void NotifyAndTerminate(bool fast_path, bool always_reboot) {
 #if defined(OS_CHROMEOS)
   static bool notified = false;
   // Return if a shutdown request has already been sent.
   if (notified)
     return;
   notified = true;
 #endif
 
   if (fast_path)
     NotifyAppTerminating();
 
 #if defined(OS_CHROMEOS)
   if (chromeos::PowerPolicyController::IsInitialized())
     chromeos::PowerPolicyController::Get()->NotifyChromeIsExiting();
 
   if (base::SysInfo::IsRunningOnChromeOS()) {
     // If we're on a ChromeOS device, reboot if an update has been applied,
-    // or else signal the session manager to log out.
-    chromeos::UpdateEngineClient* update_engine_client
-        = chromeos::DBusThreadManager::Get()->GetUpdateEngineClient();
+    //     // or else signal the session manager to log out.

[James Cook, 2016/11/30 23:01:41]

fix formatting please

[Greg K, 2016/12/01 19:44:43]

Done.

+    chromeos::UpdateEngineClient* update_engine_client =
+        chromeos::DBusThreadManager::Get()->GetUpdateEngineClient();
     if (update_engine_client->GetLastStatus().status ==
-        chromeos::UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
+            chromeos::UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT ||
+        always_reboot) {
       update_engine_client->RebootAfterUpdate();
     } else if (g_send_stop_request_to_session_manager) {
       // Don't ask SessionManager to stop session if the shutdown request comes
       // from session manager.
-      chromeos::DBusThreadManager::Get()->GetSessionManagerClient()
+      chromeos::DBusThreadManager::Get()
+          ->GetSessionManagerClient()
           ->StopSession();
     }
   } else {
     if (g_send_stop_request_to_session_manager) {
       // If running the Chrome OS build, but we're not on the device, act
       // as if we received signal from SessionManager.
       content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
                                        base::Bind(&ExitCleanly));
     }
   }
 #endif
 }
 
 #if !defined(OS_ANDROID)
 void OnAppExiting() {
   static bool notified = false;
   if (notified)
     return;
   notified = true;
   HandleAppExitingForPlatform();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace chrome