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

Unified Diff: chrome/browser/ui/omnibox/omnibox_edit_model.h

Issue 13141002: Use Instant suggested match type for Instant temporary text. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test 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
« no previous file with comments | « chrome/browser/autocomplete/search_provider.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/omnibox/omnibox_edit_model.h
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index 3e11163cb8e43d81c6790476971640b55e703333..780da0009d89d73c33a247d33a3baa8616e6b85b 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -512,11 +512,19 @@ class OmniboxEditModel {
GURL original_url_;
// True if Instant set the current temporary text, as opposed to it being set
- // due to the user arrowing up/down through the popup.
+ // due to the user arrowing up/down through the popup. This can only be true
+ // if |has_temporary_text_| is true.
// TODO(sreeram): This is a temporary hack. Remove it once the omnibox edit
// model/view code is decoupled from Instant (among other things).
bool is_temporary_text_set_by_instant_;
+ // True if the current temporary text set by Instant is a search query; false
+ // if it is a URL that can be directly navigated to. This is only valid if
+ // |is_temporary_text_set_by_instant_| is true. This field is needed because
+ // Instant's temporary text doesn't come from the popup model, so we can't
+ // lookup its type from the current match.
+ bool is_instant_temporary_text_a_search_query_;
+
// When the user's last action was to paste, we disallow inline autocomplete
// (on the theory that the user is trying to paste in a new URL or part of
// one, and in either case inline autocomplete would get in the way).
« no previous file with comments | « chrome/browser/autocomplete/search_provider.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698