chrome/browser/prerender/prerender_manager.cc - Issue 10821061: The changes for compiling with Android NDK r8b

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/prerender/prerender_manager.cc

Issue 10821061: The changes for compiling with Android NDK r8b (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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:

Index: chrome/browser/prerender/prerender_manager.cc

diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc

index 5e7b4c6b15d98dc8d424d615db8bf932d7f7f5f1..0f50f5553a88ce9af4f4b1d3dd24683ddf9c3e4a 100644

--- a/chrome/browser/prerender/prerender_manager.cc

+++ b/chrome/browser/prerender/prerender_manager.cc

@@ -214,7 +214,7 @@ PrerenderHandle* PrerenderManager::AddPrerenderFromLinkRelPrerender(

#if defined(OS_ANDROID)

// TODO(jcivelli): http://crbug.com/113322 We should have an option to disable

// link-prerender and enable omnibox-prerender only.

- return false;

+ return NULL;

gavinp 2012/07/27 17:40:27 Thanks for catching this. I should have done this

#else

DCHECK(!size.IsEmpty());

if (PrerenderData* parent_prerender_data =