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

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_controller.h

Issue 17391005: Remove Instant hooks from SearchProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Still more rebasing. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 bool DoInstant(const AutocompleteMatch& match, 60 bool DoInstant(const AutocompleteMatch& match,
61 string16 user_text, 61 string16 user_text,
62 string16 full_text, 62 string16 full_text,
63 size_t selection_start, 63 size_t selection_start,
64 size_t selection_end, 64 size_t selection_end,
65 bool user_input_in_progress, 65 bool user_input_in_progress,
66 bool in_escape_handler, 66 bool in_escape_handler,
67 bool just_deleted_text, 67 bool just_deleted_text,
68 bool keyword_is_selected); 68 bool keyword_is_selected);
69 69
70 // Calls through to SearchProvider::FinalizeInstantQuery.
71 void FinalizeInstantQuery(const string16& input_text,
72 const InstantSuggestion& suggestion);
73
74 // Sets the suggestion text. 70 // Sets the suggestion text.
75 void SetInstantSuggestion(const InstantSuggestion& suggestion); 71 void SetInstantSuggestion(const InstantSuggestion& suggestion);
76 72
77 // Set |current_match_| to an invalid value, indicating that we do not yet 73 // Set |current_match_| to an invalid value, indicating that we do not yet
78 // have a valid match for the current text in the omnibox. 74 // have a valid match for the current text in the omnibox.
79 void InvalidateCurrentMatch(); 75 void InvalidateCurrentMatch();
80 76
81 void set_popup_model(OmniboxPopupModel* popup_model) { 77 void set_popup_model(OmniboxPopupModel* popup_model) {
82 popup_ = popup_model; 78 popup_ = popup_model;
83 } 79 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 AutocompleteMatch current_match_; 137 AutocompleteMatch current_match_;
142 138
143 // The completion suggested by instant, displayed in gray text besides 139 // The completion suggested by instant, displayed in gray text besides
144 // |fill_into_edit|. 140 // |fill_into_edit|.
145 string16 gray_suggestion_; 141 string16 gray_suggestion_;
146 142
147 DISALLOW_COPY_AND_ASSIGN(OmniboxController); 143 DISALLOW_COPY_AND_ASSIGN(OmniboxController);
148 }; 144 };
149 145
150 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ 146 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/ui/omnibox/omnibox_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698