OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 5 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/format_macros.h" | 10 #include "base/format_macros.h" |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
392 query_formulation_time.InMilliseconds(), | 392 query_formulation_time.InMilliseconds(), |
393 (search_provider_ && | 393 (search_provider_ && |
394 search_provider_->field_trial_triggered_in_session()) || | 394 search_provider_->field_trial_triggered_in_session()) || |
395 (zero_suggest_provider_ && | 395 (zero_suggest_provider_ && |
396 zero_suggest_provider_->field_trial_triggered_in_session()), | 396 zero_suggest_provider_->field_trial_triggered_in_session()), |
397 input_.current_page_classification()); | 397 input_.current_page_classification()); |
398 match->destination_url = | 398 match->destination_url = |
399 GURL(template_url->url_ref().ReplaceSearchTerms(search_terms_args)); | 399 GURL(template_url->url_ref().ReplaceSearchTerms(search_terms_args)); |
400 } | 400 } |
401 | 401 |
402 void AutocompleteController::SetInAppList() { | |
403 if (search_provider_) | |
404 search_provider_->SetInAppList(); | |
405 if (zero_suggest_provider_) | |
406 zero_suggest_provider_->SetInAppList(); | |
Peter Kasting
2014/04/08 20:33:14
Is the app list really going to support zerosugges
Sam McNally
2014/04/09 01:48:56
Done.
| |
407 } | |
408 | |
402 void AutocompleteController::UpdateResult( | 409 void AutocompleteController::UpdateResult( |
403 bool regenerate_result, | 410 bool regenerate_result, |
404 bool force_notify_default_match_changed) { | 411 bool force_notify_default_match_changed) { |
405 const bool last_default_was_valid = result_.default_match() != result_.end(); | 412 const bool last_default_was_valid = result_.default_match() != result_.end(); |
406 // The following three variables are only set and used if | 413 // The following three variables are only set and used if |
407 // |last_default_was_valid|. | 414 // |last_default_was_valid|. |
408 base::string16 last_default_fill_into_edit, last_default_keyword, | 415 base::string16 last_default_fill_into_edit, last_default_keyword, |
409 last_default_associated_keyword; | 416 last_default_associated_keyword; |
410 if (last_default_was_valid) { | 417 if (last_default_was_valid) { |
411 last_default_fill_into_edit = result_.default_match()->fill_into_edit; | 418 last_default_fill_into_edit = result_.default_match()->fill_into_edit; |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
621 this, &AutocompleteController::ExpireCopiedEntries); | 628 this, &AutocompleteController::ExpireCopiedEntries); |
622 } | 629 } |
623 | 630 |
624 void AutocompleteController::StartStopTimer() { | 631 void AutocompleteController::StartStopTimer() { |
625 stop_timer_.Start(FROM_HERE, | 632 stop_timer_.Start(FROM_HERE, |
626 stop_timer_duration_, | 633 stop_timer_duration_, |
627 base::Bind(&AutocompleteController::Stop, | 634 base::Bind(&AutocompleteController::Stop, |
628 base::Unretained(this), | 635 base::Unretained(this), |
629 false)); | 636 false)); |
630 } | 637 } |
OLD | NEW |