| Index: chrome/browser/search/search.cc
|
| diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
|
| index 438533603a8297e46ab6242fb98ccc8504246169..0fb9bade9f83b215944a6194fa32cef98fda4adf 100644
|
| --- a/chrome/browser/search/search.cc
|
| +++ b/chrome/browser/search/search.cc
|
| @@ -310,7 +310,8 @@ bool NavEntryIsInstantNTP(const content::WebContents* contents,
|
| Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
|
| return IsInstantExtendedAPIEnabled() &&
|
| IsRenderedInInstantProcess(contents, profile) &&
|
| - IsInstantURL(entry->GetVirtualURL(), profile) &&
|
| + (IsInstantURL(entry->GetVirtualURL(), profile) ||
|
| + entry->GetVirtualURL() == GURL(chrome::kChromeSearchLocalNtpUrl)) &&
|
| GetSearchTermsImpl(contents, entry).empty();
|
| }
|
|
|
| @@ -318,9 +319,7 @@ bool ShouldAssignURLToInstantRenderer(const GURL& url, Profile* profile) {
|
| return url.is_valid() &&
|
| profile &&
|
| (url.SchemeIs(chrome::kChromeSearchScheme) ||
|
| - IsInstantURL(url, profile) ||
|
| - (IsInstantExtendedAPIEnabled() &&
|
| - url == GURL(chrome::kChromeSearchLocalOmniboxPopupURL)));
|
| + IsInstantURL(url, profile));
|
| }
|
|
|
| void RegisterUserPrefs(PrefRegistrySyncable* registry) {
|
|
|