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/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/format_macros.h" | 11 #include "base/format_macros.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
14 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
15 #include "base/strings/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
16 #include "base/time.h" | 16 #include "base/time.h" |
17 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" | 17 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" |
| 18 #include "chrome/browser/autocomplete/autocomplete_field_trial.h" |
18 #include "chrome/browser/autocomplete/bookmark_provider.h" | 19 #include "chrome/browser/autocomplete/bookmark_provider.h" |
19 #include "chrome/browser/autocomplete/builtin_provider.h" | 20 #include "chrome/browser/autocomplete/builtin_provider.h" |
20 #include "chrome/browser/autocomplete/extension_app_provider.h" | 21 #include "chrome/browser/autocomplete/extension_app_provider.h" |
21 #include "chrome/browser/autocomplete/history_contents_provider.h" | 22 #include "chrome/browser/autocomplete/history_contents_provider.h" |
22 #include "chrome/browser/autocomplete/history_quick_provider.h" | 23 #include "chrome/browser/autocomplete/history_quick_provider.h" |
23 #include "chrome/browser/autocomplete/history_url_provider.h" | 24 #include "chrome/browser/autocomplete/history_url_provider.h" |
24 #include "chrome/browser/autocomplete/keyword_provider.h" | 25 #include "chrome/browser/autocomplete/keyword_provider.h" |
25 #include "chrome/browser/autocomplete/search_provider.h" | 26 #include "chrome/browser/autocomplete/search_provider.h" |
26 #include "chrome/browser/autocomplete/shortcuts_provider.h" | 27 #include "chrome/browser/autocomplete/shortcuts_provider.h" |
27 #include "chrome/browser/autocomplete/zero_suggest_provider.h" | 28 #include "chrome/browser/autocomplete/zero_suggest_provider.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 AutocompleteControllerDelegate* delegate, | 88 AutocompleteControllerDelegate* delegate, |
88 int provider_types) | 89 int provider_types) |
89 : delegate_(delegate), | 90 : delegate_(delegate), |
90 keyword_provider_(NULL), | 91 keyword_provider_(NULL), |
91 search_provider_(NULL), | 92 search_provider_(NULL), |
92 zero_suggest_provider_(NULL), | 93 zero_suggest_provider_(NULL), |
93 done_(true), | 94 done_(true), |
94 in_start_(false), | 95 in_start_(false), |
95 in_zero_suggest_(false), | 96 in_zero_suggest_(false), |
96 profile_(profile) { | 97 profile_(profile) { |
| 98 // AND with the disabled providers, if any. |
| 99 provider_types &= ~AutocompleteFieldTrial::GetDisabledProviderTypes(); |
97 bool use_hqp = !!(provider_types & AutocompleteProvider::TYPE_HISTORY_QUICK); | 100 bool use_hqp = !!(provider_types & AutocompleteProvider::TYPE_HISTORY_QUICK); |
98 // TODO(mrossetti): Permanently modify the HistoryURLProvider to not search | 101 // TODO(mrossetti): Permanently modify the HistoryURLProvider to not search |
99 // titles once HQP is turned on permanently. | 102 // titles once HQP is turned on permanently. |
100 // History quick provider can be used on all platforms other than Android. | 103 // History quick provider can be used on all platforms other than Android. |
101 // TODO(jcivelli): Enable the History Quick Provider and figure out why it | 104 // TODO(jcivelli): Enable the History Quick Provider and figure out why it |
102 // reports the wrong results for some pages. | 105 // reports the wrong results for some pages. |
103 #if defined(OS_ANDROID) | 106 #if defined(OS_ANDROID) |
104 use_hqp = false; | 107 use_hqp = false; |
105 #endif | 108 #endif |
106 | 109 |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
522 } | 525 } |
523 done_ = true; | 526 done_ = true; |
524 } | 527 } |
525 | 528 |
526 void AutocompleteController::StartExpireTimer() { | 529 void AutocompleteController::StartExpireTimer() { |
527 if (result_.HasCopiedMatches()) | 530 if (result_.HasCopiedMatches()) |
528 expire_timer_.Start(FROM_HERE, | 531 expire_timer_.Start(FROM_HERE, |
529 base::TimeDelta::FromMilliseconds(kExpireTimeMS), | 532 base::TimeDelta::FromMilliseconds(kExpireTimeMS), |
530 this, &AutocompleteController::ExpireCopiedEntries); | 533 this, &AutocompleteController::ExpireCopiedEntries); |
531 } | 534 } |
OLD | NEW |