chrome/browser/profiles/profile_impl.cc - Issue 6966017: Remove a chrome dependency by removing Prerender from ResourceDispatcherHost.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 6966017: Remove a chrome dependency by removing Prerender from ResourceDispatcherHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years, 7 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_tracker_unittest.cc ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.cc

diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc

index 75e0694fd6406aa49d0ff392b097320b8fa8bcf3..650901ce5eaf984403fd36e90e254f1d196b8d32 100644

--- a/chrome/browser/profiles/profile_impl.cc

+++ b/chrome/browser/profiles/profile_impl.cc

@@ -1645,7 +1645,11 @@ PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {

prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {

if (!prerender::PrerenderManager::IsPrerenderingPossible())

return NULL;

- if (!prerender_manager_.get())

- prerender_manager_.reset(new prerender::PrerenderManager(this));

+ if (!prerender_manager_.get()) {

+ CHECK(g_browser_process->prerender_tracker());

+ prerender_manager_.reset(

+ new prerender::PrerenderManager(

+ this, g_browser_process->prerender_tracker()));

+ }

return prerender_manager_.get();

}