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

Unified Diff: chrome/browser/prefetch/prefetch.cc

Issue 419833003: Prefetch must not run on cellular until the user can disable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefetch/prefetch.cc
diff --git a/chrome/browser/prefetch/prefetch.cc b/chrome/browser/prefetch/prefetch.cc
index 84b517b87e594c1f830e62ac7122cff9c696184b..74c39b209e5cead587fb6d434cb96dfd786c41bf 100644
--- a/chrome/browser/prefetch/prefetch.cc
+++ b/chrome/browser/prefetch/prefetch.cc
@@ -19,9 +19,17 @@ bool IsPrefetchEnabled(content::ResourceContext* resource_context) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
-
DCHECK(io_data);
+ // TODO(bnc): Remove this condition once the new
+ // predictive preference is used on all platforms. See crbug.com/334602.
+ if (io_data->network_prediction_options()->GetValue() ==
+ chrome_browser_net::NETWORK_PREDICTION_UNSET &&
+ net::NetworkChangeNotifier::IsConnectionCellular(
+ net::NetworkChangeNotifier::GetConnectionType())) {
+ return false;
+ }
+
return chrome_browser_net::CanPredictNetworkActionsIO(io_data) &&
!DisableForFieldTrial();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698