summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles/profile_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/profiles/profile_impl.cc')
-rw-r--r--chrome/browser/profiles/profile_impl.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 5b60dc8..ff46694 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -771,7 +771,8 @@ PrefService* ProfileImpl::GetPrefs() {
GetExtensionPrefValueMap()));
DCHECK(!net_pref_observer_.get());
- net_pref_observer_.reset(new NetPrefObserver(prefs_.get()));
+ net_pref_observer_.reset(
+ new NetPrefObserver(prefs_.get(), GetPrerenderManager()));
}
return prefs_.get();
@@ -1492,7 +1493,7 @@ PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
}
prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
- if (!prerender::PrerenderManager::IsPrerenderingEnabled())
+ if (!prerender::PrerenderManager::IsPrerenderingPossible())
return NULL;
if (!prerender_manager_)
prerender_manager_ = new prerender::PrerenderManager(this);