Index: chrome/browser/search/search.cc |
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc |
index 438533603a8297e46ab6242fb98ccc8504246169..82d221583a57e37b6dfc8214223cd2428801fa70 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)) && |
Dan Beam
2013/03/25 18:13:49
NtpUrl (you've hit on exactly why we do MULTABBR a
jeremycho
2013/03/25 21:27:16
Done.
|
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) { |