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…

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/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 Dan's 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

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 {

samarth 2013/04/16 16:55:10 How about renaming to just IsLocal? (or IsLocalPa

jeremycho 2013/04/16 20:39:09 Done.

return contents() &&

- contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl);

+ (contents()->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl) ||

+ contents()->GetURL() == GURL(chrome::kChromeSearchLocalGoogleNtpUrl));

}

bool InstantPage::IsLocalOverlay() const {

samarth 2013/04/16 16:55:10 You can delete this method.

jeremycho 2013/04/16 20:39:09 Done.

« chrome/browser/ui/search/instant_controller.cc ('K') | « chrome/browser/ui/search/instant_controller.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »