chrome/browser/ui/omnibox/omnibox_edit_model.cc - Issue 11876045: [Search] Store and recall search terms using NavigationEntry to improve search term extraction

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/omnibox/omnibox_edit_model.cc

Issue 11876045: [Search] Store and recall search terms using NavigationEntry to improve search term extraction (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Clean Created 7 years, 11 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/instant/instant_controller.cc ('K') | « chrome/browser/sessions/session_types_unittest.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/omnibox/omnibox_edit_model.cc

diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc

index 324f7086edc6181fadf1242a5021e3b5e3b7be4b..040695319971926207cf80d1f74418154abc541b 100644

--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc

+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc

@@ -655,6 +655,15 @@ void OmniboxEditModel::OpenMatch(const AutocompleteMatch& match,

if (disposition != NEW_BACKGROUND_TAB) {

base::AutoReset<bool> tmp(&in_revert_, true);

view_->RevertAll(); // Revert the box to its unedited state

+ if (controller()->GetInstant() &&

+ controller()->GetInstant()->IsInstantExtendedSearch()) {

+ // In the case of an instant-extended search, actually revert to

+ // |last_omnibox_text|, which is what the user is searching for. This

+ // avoids a flash of the previous query.

+ view_->OnTemporaryTextMaybeChanged(

+ controller()->GetInstant()->last_omnibox_text(),

+ true);

+ }

}

if (match.type == AutocompleteMatch::EXTENSION_APP) {