Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2413)

Unified Diff: chrome/browser/sessions/base_session_service.cc

Issue 84893002: Add chrome://quit to shut down Chrome, including packaged apps. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/sessions/session_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/base_session_service.cc
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
index f06a79cec38c02646d34ac6ae9bf1da50f7734b7..7948d1318b636ef947780519f5a7ec7421e10276 100644
--- a/chrome/browser/sessions/base_session_service.cc
+++ b/chrome/browser/sessions/base_session_service.cc
@@ -14,6 +14,7 @@
#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"
@@ -264,7 +265,11 @@ bool BaseSessionService::RestoreSetWindowAppNameCommand(
}
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
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/sessions/session_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698