summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete.cc
diff options
context:
space:
mode:
authormrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 04:24:55 +0000
committermrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 04:24:55 +0000
commitc99037d1bad96b729e015a84ca19e5a144689ccd (patch)
tree90fde2ca30a50cd28b60e8368e4a4ca94650e32f /chrome/browser/autocomplete/autocomplete.cc
parent456c8047e4c8cea12174f649e209798e11d83781 (diff)
downloadchromium_src-c99037d1bad96b729e015a84ca19e5a144689ccd.zip
chromium_src-c99037d1bad96b729e015a84ca19e5a144689ccd.tar.gz
chromium_src-c99037d1bad96b729e015a84ca19e5a144689ccd.tar.bz2
Multi-highlight and scoring improvements.
Incorporate multi-offset highlighting into HQP. Update results scoring. Switch to integer scoring operations from float. BUG=79271,78153 TEST=Added unit tests. Updated unit tests. Review URL: http://codereview.chromium.org/6859005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete.cc')
-rw-r--r--chrome/browser/autocomplete/autocomplete.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index c022f96..f072c0c 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -788,7 +788,9 @@ AutocompleteController::AutocompleteController(
in_start_(false) {
search_provider_ = new SearchProvider(this, profile);
providers_.push_back(search_provider_);
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableHistoryQuickProvider) &&
+ !CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableHistoryQuickProvider))
providers_.push_back(new HistoryQuickProvider(this, profile));
if (!CommandLine::ForCurrentProcess()->HasSwitch(