Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4690)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/search/instant_page.cc

Issue 13905008: Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear… (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Respond to comments. Created 7 years, 8 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
« chrome/browser/resources/local_ntp/local_ntp.js ('K') | « chrome/browser/ui/search/instant_controller.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/instant_page.cc
diff --git a/chrome/browser/ui/search/instant_page.cc b/chrome/browser/ui/search/instant_page.cc
index 0757da208e0c1dc0b30a81238704912264fe5bd8..db9603ec945af128244bd6b3842041af2bf92614 100644
--- a/chrome/browser/ui/search/instant_page.cc
+++ b/chrome/browser/ui/search/instant_page.cc
@@ -19,7 +19,8 @@ InstantPage::~InstantPage() {
bool InstantPage::IsLocalNTP() const {
return contents() &&
- contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl);
+ (contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl) ||
+ contents()->GetURL() == GURL(chrome::kChromeSearchLocalGoogleNtpUrl));
}
bool InstantPage::IsLocalOverlay() const {
« chrome/browser/resources/local_ntp/local_ntp.js ('K') | « chrome/browser/ui/search/instant_controller.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698