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

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 133993003: Remove prerender::Config::https_allowed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
« no previous file with comments | « chrome/browser/prerender/prerender_config.cc ('k') | chrome/browser/prerender/prerender_final_status.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index f818112c1be976cf30c23a09f19476483d80bcc8..75e8d51fba53cc269e26c415cb81edb87b0741d1 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -523,18 +523,11 @@ bool PrerenderContents::OnMessageReceived(const IPC::Message& message) {
}
bool PrerenderContents::CheckURL(const GURL& url) {
- const bool http = url.SchemeIs(content::kHttpScheme);
- const bool https = url.SchemeIs(content::kHttpsScheme);
- if (!http && !https) {
+ if (!url.SchemeIsHTTPOrHTTPS()) {
DCHECK_NE(MATCH_COMPLETE_REPLACEMENT_PENDING, match_complete_status_);
Destroy(FINAL_STATUS_UNSUPPORTED_SCHEME);
return false;
}
- if (https && !prerender_manager_->config().https_allowed) {
- DCHECK_NE(MATCH_COMPLETE_REPLACEMENT_PENDING, match_complete_status_);
- Destroy(FINAL_STATUS_HTTPS);
- return false;
- }
if (match_complete_status_ != MATCH_COMPLETE_REPLACEMENT_PENDING &&
prerender_manager_->HasRecentlyBeenNavigatedTo(origin(), url)) {
Destroy(FINAL_STATUS_RECENTLY_VISITED);
« no previous file with comments | « chrome/browser/prerender/prerender_config.cc ('k') | chrome/browser/prerender/prerender_final_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698