chrome/browser/ui/search/search_tab_helper.cc - Issue 137993020: (Try 2) InstantExtended: remove dead code related to the non-cacheable NTP.

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/ui/search/search_tab_helper.cc

Issue 137993020: (Try 2) InstantExtended: remove dead code related to the non-cacheable NTP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Disable InstantPolicyTests Created 6 years, 11 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/ui/search/local_ntp_browsertest.cc ('k') | chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search/search_tab_helper.cc

diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc

index e1deba0fc4462963bd9904df65ccd18e7fae97a8..cf249b7b7887b357076dbe49f2107b2916e0fae0 100644

--- a/chrome/browser/ui/search/search_tab_helper.cc

+++ b/chrome/browser/ui/search/search_tab_helper.cc

@@ -70,8 +70,7 @@ void RecordCacheableNTPLoadHistogram(bool succeeded) {

bool IsCacheableNTP(const content::WebContents* contents) {

const content::NavigationEntry* entry =

contents->GetController().GetLastCommittedEntry();

- return chrome::ShouldUseCacheableNTP() &&

- chrome::NavEntryIsInstantNTP(contents, entry) &&

+ return chrome::NavEntryIsInstantNTP(contents, entry) &&

entry->GetURL() != GURL(chrome::kChromeSearchLocalNtpUrl);

}

@@ -295,7 +294,6 @@ void SearchTabHelper::DidFailProvisionalLoad(

// navigation so it shouldn't be redirected.

if (is_main_frame &&

error_code != net::ERR_ABORTED &&

- chrome::ShouldUseCacheableNTP() &&

validated_url != GURL(chrome::kChromeSearchLocalNtpUrl) &&

chrome::IsNTPURL(validated_url, profile())) {

RedirectToLocalNTP();