summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/history_contents_provider.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 18:21:27 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 18:21:27 +0000
commit8deeb95696562494db58140a46fbe06432f39d57 (patch)
treee74fed0de316dd2bc97805b0ba2a942fb8d53aff /chrome/browser/autocomplete/history_contents_provider.cc
parent3b2a95c36e98d35b417466054349d2d5308c2af3 (diff)
downloadchromium_src-8deeb95696562494db58140a46fbe06432f39d57.zip
chromium_src-8deeb95696562494db58140a46fbe06432f39d57.tar.gz
chromium_src-8deeb95696562494db58140a46fbe06432f39d57.tar.bz2
Move |result_| and |latest_result_| to the autocomplete controller.
This purposefully does not change the communication interface between the edit and the popup; that's coming in a subsequent pass. As a result, right now the popup isn't really much simpler. That should eventually change. Review URL: http://codereview.chromium.org/6596 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/history_contents_provider.cc')
-rw-r--r--chrome/browser/autocomplete/history_contents_provider.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/history_contents_provider.cc b/chrome/browser/autocomplete/history_contents_provider.cc
index d8c91e8..c1ef435c 100644
--- a/chrome/browser/autocomplete/history_contents_provider.cc
+++ b/chrome/browser/autocomplete/history_contents_provider.cc
@@ -38,11 +38,11 @@ bool CompareMatchRelevance(const MatchReference& a, const MatchReference& b) {
using history::HistoryDatabase;
void HistoryContentsProvider::Start(const AutocompleteInput& input,
- bool minimal_changes,
- bool synchronous_only) {
+ bool minimal_changes) {
matches_.clear();
if (input.text().empty() || (input.type() == AutocompleteInput::INVALID) ||
+ !profile_ ||
// The history service or bookmark bar model must exist.
!(profile_->GetHistoryService(Profile::EXPLICIT_ACCESS) ||
profile_->GetBookmarkModel())) {
@@ -80,7 +80,7 @@ void HistoryContentsProvider::Start(const AutocompleteInput& input,
// allowed to keep running it, do so, and when it finishes, its results will
// get marked up for this new input. In synchronous_only mode, cancel the
// history query.
- if (synchronous_only) {
+ if (input.synchronous_only()) {
done_ = true;
request_consumer_.CancelAllRequests();
}
@@ -100,7 +100,7 @@ void HistoryContentsProvider::Start(const AutocompleteInput& input,
// Convert the bookmark results.
ConvertResults();
- if (!synchronous_only) {
+ if (!input.synchronous_only()) {
HistoryService* history =
profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
if (history) {