From 9333f1812b353233e6c492a6dfe7efb3a03717a3 Mon Sep 17 00:00:00 2001 From: "sky@google.com" Date: Tue, 9 Dec 2008 17:34:17 +0000 Subject: Moves some utility functions out of bookmark model into bookmark_utils. In addition I've converted to using TreeNodeIterator. This doesn't contain any functionality changes. BUG=4065 TEST=none Review URL: http://codereview.chromium.org/13642 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6589 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/autocomplete/history_contents_provider.cc | 9 +++++---- chrome/browser/autocomplete/history_contents_provider.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'chrome/browser/autocomplete') diff --git a/chrome/browser/autocomplete/history_contents_provider.cc b/chrome/browser/autocomplete/history_contents_provider.cc index 9eef77c..cc1598f 100644 --- a/chrome/browser/autocomplete/history_contents_provider.cc +++ b/chrome/browser/autocomplete/history_contents_provider.cc @@ -6,6 +6,7 @@ #include "base/histogram.h" #include "base/string_util.h" +#include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/history/query_parser.h" #include "chrome/browser/profile.h" #include "net/base/net_util.h" @@ -272,9 +273,9 @@ void HistoryContentsProvider::QueryBookmarks(const AutocompleteInput& input) { // empty. TimeTicks start_time = TimeTicks::Now(); - std::vector matches; - bookmark_model->GetBookmarksMatchingText(input.text(), kMaxMatchCount, - &matches); + std::vector matches; + bookmark_utils::GetBookmarksMatchingText(bookmark_model, input.text(), + kMaxMatchCount, &matches); for (size_t i = 0; i < matches.size(); ++i) AddBookmarkTitleMatchToResults(matches[i]); UMA_HISTOGRAM_TIMES(L"Omnibox.QueryBookmarksTime", @@ -282,7 +283,7 @@ void HistoryContentsProvider::QueryBookmarks(const AutocompleteInput& input) { } void HistoryContentsProvider::AddBookmarkTitleMatchToResults( - const BookmarkModel::TitleMatch& match) { + const bookmark_utils::TitleMatch& match) { history::URLResult url_result(match.node->GetURL(), match.match_positions); url_result.set_title(match.node->GetTitle()); results_.AppendURLBySwapping(&url_result); diff --git a/chrome/browser/autocomplete/history_contents_provider.h b/chrome/browser/autocomplete/history_contents_provider.h index 8c4f62c..ea02ff2 100644 --- a/chrome/browser/autocomplete/history_contents_provider.h +++ b/chrome/browser/autocomplete/history_contents_provider.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H__ #include "chrome/browser/autocomplete/autocomplete.h" -#include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/history/history.h" // HistoryContentsProvider is an AutocompleteProvider that provides results from @@ -66,7 +66,7 @@ class HistoryContentsProvider : public AutocompleteProvider { // Converts a BookmarkModel::TitleMatch to a QueryResult and adds it to // results_. - void AddBookmarkTitleMatchToResults(const BookmarkModel::TitleMatch& match); + void AddBookmarkTitleMatchToResults(const bookmark_utils::TitleMatch& match); CancelableRequestConsumerT request_consumer_; -- cgit v1.1