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

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

Issue 14698028: Omnibox refactor. OmniboxController now holds an AutocompleteMatch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased and cleaned-up. Created 7 years, 6 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/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 8529eb2f7584544fd435b0aa3db3c0bc4aaa3062..9f7b917959e211f336a9a6479c626c3046e8d199 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -96,7 +96,7 @@ class OmniboxEditModel {
// Returns the match for the current text. If the user has not edited the text
// this is the match corresponding to the permanent text.
- AutocompleteMatch CurrentMatch();
+ AutocompleteMatch CurrentMatch() const;
// Called when the user wants to export the entire current text as a URL.
// Sets the url, and if known, the title and favicon.
@@ -138,10 +138,6 @@ class OmniboxEditModel {
// Sets the user_text_ to |text|. Only the View should call this.
void SetUserText(const string16& text);
- // Calls through to SearchProvider::FinalizeInstantQuery.
- void FinalizeInstantQuery(const string16& input_text,
- const InstantSuggestion& suggestion);
-
// Sets the suggestion text.
void SetInstantSuggestion(const InstantSuggestion& suggestion);
@@ -307,8 +303,13 @@ class OmniboxEditModel {
omnibox_controller_->OnPopupBoundsChanged(bounds);
}
- // Called when the results have changed in the OmniboxController.
- void OnResultChanged(bool default_match_changed);
+ // Called when the current match has changed in the OmniboxController.
+ void OnCurrentMatchChanged(bool is_temporary_set_by_instant);
+
+ // Access the current view text.
+ string16 GetViewText() const;
+
+ string16 user_text() const { return user_text_; }
Peter Kasting 2013/06/11 22:42:55 Musing: It seems like we have some accessors above
beaudoin 2013/06/14 21:39:38 I agree. Let's push that back to a future CL if yo
// TODO(beaudoin): We need this to allow OmniboxController access the
// InstantController via OmniboxEditController, because the only valid pointer

Powered by Google App Engine
This is Rietveld 408576698