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

Side by Side Diff: chrome/browser/prerender/prerender_manager.cc

Issue 23064011: Consolidate scheme checks into an easy GURL method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prerender/prerender_manager.h" 5 #include "chrome/browser/prerender/prerender_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 for (size_t i = 0; i < arraysize(kValidHttpMethods); ++i) { 893 for (size_t i = 0; i < arraysize(kValidHttpMethods); ++i) {
894 if (method.compare(kValidHttpMethods[i]) == 0) 894 if (method.compare(kValidHttpMethods[i]) == 0)
895 return true; 895 return true;
896 } 896 }
897 897
898 return false; 898 return false;
899 } 899 }
900 900
901 // static 901 // static
902 bool PrerenderManager::DoesURLHaveValidScheme(const GURL& url) { 902 bool PrerenderManager::DoesURLHaveValidScheme(const GURL& url) {
903 return (IsWebURL(url) || 903 return (url.SchemeIsHTTPOrHTTPS() ||
904 url.SchemeIs(extensions::kExtensionScheme) || 904 url.SchemeIs(extensions::kExtensionScheme) ||
905 url.SchemeIs("data")); 905 url.SchemeIs("data"));
906 } 906 }
907 907
908 // static 908 // static
909 bool PrerenderManager::DoesSubresourceURLHaveValidScheme(const GURL& url) { 909 bool PrerenderManager::DoesSubresourceURLHaveValidScheme(const GURL& url) {
910 return DoesURLHaveValidScheme(url) || url == GURL(content::kAboutBlankURL); 910 return DoesURLHaveValidScheme(url) || url == GURL(content::kAboutBlankURL);
911 } 911 }
912 912
913 DictionaryValue* PrerenderManager::GetAsValue() const { 913 DictionaryValue* PrerenderManager::GetAsValue() const {
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 if (!IsWebContentsPrerendering(tab, NULL)) 1464 if (!IsWebContentsPrerendering(tab, NULL))
1465 return; 1465 return;
1466 1466
1467 prerender_tracker()->TryCancel( 1467 prerender_tracker()->TryCancel(
1468 render_process_id, render_view_id, 1468 render_process_id, render_view_id,
1469 prerender::FINAL_STATUS_CREATING_AUDIO_STREAM); 1469 prerender::FINAL_STATUS_CREATING_AUDIO_STREAM);
1470 } 1470 }
1471 1471
1472 void PrerenderManager::RecordLikelyLoginOnURL(const GURL& url) { 1472 void PrerenderManager::RecordLikelyLoginOnURL(const GURL& url) {
1473 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1473 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1474 if (!IsWebURL(url)) 1474 if (!url.SchemeIsHTTPOrHTTPS())
1475 return; 1475 return;
1476 if (logged_in_predictor_table_.get()) { 1476 if (logged_in_predictor_table_.get()) {
1477 BrowserThread::PostTask( 1477 BrowserThread::PostTask(
1478 BrowserThread::DB, 1478 BrowserThread::DB,
1479 FROM_HERE, 1479 FROM_HERE,
1480 base::Bind(&LoggedInPredictorTable::AddDomainFromURL, 1480 base::Bind(&LoggedInPredictorTable::AddDomainFromURL,
1481 logged_in_predictor_table_, 1481 logged_in_predictor_table_,
1482 url)); 1482 url));
1483 } 1483 }
1484 std::string key = LoggedInPredictorTable::GetKey(url); 1484 std::string key = LoggedInPredictorTable::GetKey(url);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 logged_in_state_->erase(domain_key); 1566 logged_in_state_->erase(domain_key);
1567 } 1567 }
1568 1568
1569 void PrerenderManager::LoggedInPredictorDataReceived( 1569 void PrerenderManager::LoggedInPredictorDataReceived(
1570 scoped_ptr<LoggedInStateMap> new_map) { 1570 scoped_ptr<LoggedInStateMap> new_map) {
1571 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1571 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1572 logged_in_state_.swap(new_map); 1572 logged_in_state_.swap(new_map);
1573 } 1573 }
1574 1574
1575 } // namespace prerender 1575 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_histograms.cc ('k') | chrome/browser/prerender/prerender_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698