| Index: chrome/browser/net/predictor.cc
|
| diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
|
| index fea0171d5f284050519fded47c939a0b70537b36..9addc6fc6bf9e2727ac5402ebe19fa9ede77078f 100644
|
| --- a/chrome/browser/net/predictor.cc
|
| +++ b/chrome/browser/net/predictor.cc
|
| @@ -233,8 +233,6 @@ void Predictor::AnticipateOmniboxUrl(const GURL& url, bool preconnectable) {
|
| return;
|
| if (!url.is_valid() || !url.has_host())
|
| return;
|
| - if (!CanPredictNetworkActionsUI())
|
| - return;
|
|
|
| std::string host = url.HostNoBrackets();
|
| bool is_new_host_request = (host != last_omnibox_host_);
|
| @@ -243,7 +241,7 @@ void Predictor::AnticipateOmniboxUrl(const GURL& url, bool preconnectable) {
|
| UrlInfo::ResolutionMotivation motivation(UrlInfo::OMNIBOX_MOTIVATED);
|
| base::TimeTicks now = base::TimeTicks::Now();
|
|
|
| - if (preconnect_enabled_) {
|
| + if (preconnect_enabled_ && CanPreconnectUI()) {
|
| if (preconnectable && !is_new_host_request) {
|
| ++consecutive_omnibox_preconnect_count_;
|
| // The omnibox suggests a search URL (for which we can preconnect) after
|
| @@ -311,10 +309,10 @@ void Predictor::PreconnectUrlAndSubresources(const GURL& url,
|
| return;
|
|
|
| if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
|
| - if (!CanPredictNetworkActionsUI())
|
| + if (!CanPreconnectUI())
|
| return;
|
| } else {
|
| - if (!CanPredictNetworkActionsIO())
|
| + if (!CanPreconnectIO())
|
| return;
|
| }
|
|
|
| @@ -956,6 +954,14 @@ bool Predictor::CanPredictNetworkActionsIO() {
|
| return chrome_browser_net::CanPredictNetworkActionsIO(profile_io_data_);
|
| }
|
|
|
| +bool Predictor::CanPreconnectUI() {
|
| + return chrome_browser_net::CanPreconnectUI(user_prefs_);
|
| +}
|
| +
|
| +bool Predictor::CanPreconnectIO() {
|
| + return chrome_browser_net::CanPreconnectIO(profile_io_data_);
|
| +}
|
| +
|
| enum SubresourceValue {
|
| PRECONNECTION,
|
| PRERESOLUTION,
|
| @@ -1347,5 +1353,7 @@ void SimplePredictor::ShutdownOnUIThread() {
|
|
|
| bool SimplePredictor::CanPredictNetworkActionsUI() { return true; }
|
| bool SimplePredictor::CanPredictNetworkActionsIO() { return true; }
|
| +bool SimplePredictor::CanPreconnectUI() { return true; }
|
| +bool SimplePredictor::CanPreconnectIO() { return true; }
|
|
|
| } // namespace chrome_browser_net
|
|
|