Add chrome://quit to shut down Chrome, including packaged apps.

chrome/browser/sessions/base_session_service.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/sessions/base_session_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/referrer.h"
 
 using content::BrowserThread;
 using content::NavigationEntry;
 
 // BaseSessionService ---------------------------------------------------------
 
 namespace {
@@ skipping 230 matching lines @@
   scoped_ptr<Pickle> pickle(command.PayloadAsPickle());
   if (!pickle.get())
     return false;
 
   PickleIterator iterator(*pickle);
   return pickle->ReadInt(&iterator, window_id) &&
       pickle->ReadString(&iterator, app_name);
 }
 
 bool BaseSessionService::ShouldTrackEntry(const GURL& url) {
-  return url.is_valid();
+  // Blacklist chrome://quit and chrome://restart to avoid quit or restart
+  // loops.
+  return url.is_valid() && !(url.SchemeIs(chrome::kChromeUIScheme) &&
+                             (url.host() == chrome::kChromeUIQuitHost ||
+                              url.host() == chrome::kChromeUIRestartHost));
 }
 
 CancelableTaskTracker::TaskId
     BaseSessionService::ScheduleGetLastSessionCommands(
     const InternalGetCommandsCallback& callback,
     CancelableTaskTracker* tracker) {
   CancelableTaskTracker::IsCanceledCallback is_canceled;
   CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled);
 
   InternalGetCommandsCallback run_if_not_canceled =
@@ skipping 20 matching lines @@
                                          from_here,
                                          task);
   } else {
     // Fall back to executing on the main thread if the sequence
     // worker pool has been requested to shutdown (around shutdown
     // time).
     task.Run();
     return true;
   }
 }