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

Unified Diff: chrome/browser/autocomplete/autocomplete_controller.cc

Issue 11414303: Make Google Search autocomplete provider cursor aware. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years 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/autocomplete/autocomplete_controller.cc
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc
index 26f53903625f58c2084dcd171b5e44a9d4f4a4a2..e0859617281b4bee3ff8e91452fe9fba6d0e567e 100644
--- a/chrome/browser/autocomplete/autocomplete_controller.cc
+++ b/chrome/browser/autocomplete/autocomplete_controller.cc
@@ -166,18 +166,11 @@ AutocompleteController::~AutocompleteController() {
providers_.clear(); // Not really necessary.
}
-void AutocompleteController::Start(
- const string16& text,
- const string16& desired_tld,
- bool prevent_inline_autocomplete,
- bool prefer_keyword,
- bool allow_exact_keyword_match,
- AutocompleteInput::MatchesRequested matches_requested) {
+void AutocompleteController::Start(const AutocompleteInput& input) {
const string16 old_input_text(input_.text());
const AutocompleteInput::MatchesRequested old_matches_requested =
input_.matches_requested();
- input_ = AutocompleteInput(text, desired_tld, prevent_inline_autocomplete,
- prefer_keyword, allow_exact_keyword_match, matches_requested);
+ input_ = input;
// See if we can avoid rerunning autocomplete when the query hasn't changed
// much. When the user presses or releases the ctrl key, the desired_tld
@@ -200,13 +193,14 @@ void AutocompleteController::Start(
for (ACProviders::iterator i(providers_.begin()); i != providers_.end();
++i) {
(*i)->Start(input_, minimal_changes);
- if (matches_requested != AutocompleteInput::ALL_MATCHES)
+ if (input.matches_requested() != AutocompleteInput::ALL_MATCHES)
DCHECK((*i)->done());
}
- if (matches_requested == AutocompleteInput::ALL_MATCHES &&
- (text.length() < 6)) {
+ if (input.matches_requested() == AutocompleteInput::ALL_MATCHES &&
+ (input.text().length() < 6)) {
base::TimeTicks end_time = base::TimeTicks::Now();
- std::string name = "Omnibox.QueryTime." + base::IntToString(text.length());
+ std::string name = "Omnibox.QueryTime." + base::IntToString(
+ input.text().length());
base::Histogram* counter = base::Histogram::FactoryGet(
name, 1, 1000, 50, base::Histogram::kUmaTargetedHistogramFlag);
counter->Add(static_cast<int>((end_time - start_time).InMilliseconds()));

Powered by Google App Engine
This is Rietveld 408576698