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

Unified Diff: content/browser/browser_url_handler_impl.cc

Issue 2740013008: Fix tab restore for view-source Chrome extension pages. (Closed)
Patch Set: Address Charlie's comments Created 3 years, 9 months 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
Index: content/browser/browser_url_handler_impl.cc
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index a79b89dda4c26494bbacbabd92cc3fa70ec0e578..31cbaabfb4a24e6985ee367e91cd271cbc6bb20b 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -35,11 +35,11 @@ static bool HandleViewSource(GURL* url, BrowserContext* browser_context) {
};
// Merge all the schemes for which view-source is allowed by default, with
- // the WebUI schemes defined by the ContentBrowserClient.
+ // the view-source schemes defined by the ContentBrowserClient.
std::vector<std::string> all_allowed_sub_schemes;
for (size_t i = 0; i < arraysize(default_allowed_sub_schemes); ++i)
all_allowed_sub_schemes.push_back(default_allowed_sub_schemes[i]);
- GetContentClient()->browser()->GetAdditionalWebUISchemes(
+ GetContentClient()->browser()->GetAdditionalViewSourceSchemes(
&all_allowed_sub_schemes);
bool is_sub_scheme_allowed = false;
@@ -95,10 +95,11 @@ BrowserURLHandlerImpl::BrowserURLHandlerImpl() :
fixup_handler_(nullptr) {
AddHandlerPair(&DebugURLHandler, BrowserURLHandlerImpl::null_handler());
- GetContentClient()->browser()->BrowserURLHandlerCreated(this);
-
- // view-source:
+ // view-source: should take precedence over other rewriters, so it's
+ // important to add it before calling up to the content client.
AddHandlerPair(&HandleViewSource, &ReverseViewSource);
+
+ GetContentClient()->browser()->BrowserURLHandlerCreated(this);
}
BrowserURLHandlerImpl::~BrowserURLHandlerImpl() {

Powered by Google App Engine
This is Rietveld 408576698