chrome/browser/ui/search/search_tab_helper.cc - Issue 10787028: Converts SearchViewController to use live NTP content instead of placeholder

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 10787028: Converts SearchViewController to use live NTP content instead of placeholder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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/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 d4deeedfcfa054029e4531075c4c04db4c17b1ab..c0b1522c5b0e82969e2829fdbccad50756e69f08 100644

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

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

@@ -60,7 +60,7 @@ void SearchTabHelper::OmniboxEditModelChanged(OmniboxEditModel* edit_model) {

Mode::Type mode = Mode::MODE_DEFAULT;

GURL url(web_contents()->GetURL());

if (google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec()) ||

- edit_model->has_focus()) {

+ (edit_model->has_focus() && edit_model->user_input_in_progress())) {

dhollowa 2012/07/20 00:34:09 Until zero-suggest lands, the presence of the sugg

mode = Mode::MODE_SEARCH;

}

model_->SetMode(Mode(mode, true));

« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | chrome/browser/ui/views/search_view_controller.cc » ('J')