Renames BoomarkBarModel to BookmarkModel.

chrome/browser/autocomplete/history_contents_provider.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H__

[jcampan, 2008/09/10 23:01:24]

Since you were changing the double __ to a single _ in another h file, may be
you could do it there as well?

 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H__
 
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history.h"
 
 // HistoryContentsProvider is an AutocompleteProvider that provides results from
 // the contents (body and/or title) of previously visited pages.
 // HistoryContentsProvider gets results from two sources:
 // . HistoryService: this provides results for matches in the body/title of
 //   previously viewed pages. This is asynchronous.
-// . BookmarkBarModel: provides results for matches in the titles of bookmarks.
+// . BookmarkModel: provides results for matches in the titles of bookmarks.
 //   This is synchronous.
 class HistoryContentsProvider : public AutocompleteProvider {
  public:
   HistoryContentsProvider(ACProviderListener* listener, Profile* profile)
       : AutocompleteProvider(listener, profile, "HistoryContents"),
         have_results_(false) {
     DCHECK(profile);
   }
 
   // As necessary asks the history service for the relevant results. When
@@ skipping 31 matching lines @@
                            AutocompleteMatch* match) const;
 
   // Calculates and returns the relevance of a particular result. See the
   // chart in autocomplete.h for the list of values this returns.
   int CalculateRelevance(const history::URLResult& result);
 
   // Queries the bookmarks for any bookmarks whose title matches input. All
   // matches are added directly to results_.
   void QueryBookmarks(const AutocompleteInput& input);
 
-  // Converts a BookmarkBarModel::TitleMatch to a QueryResult and adds it
-  // to results_.
-  void AddBookmarkTitleMatchToResults(
-      const BookmarkBarModel::TitleMatch& match);
+  // Converts a BookmarkModel::TitleMatch to a QueryResult and adds it to
+  // results_.
+  void AddBookmarkTitleMatchToResults(const BookmarkModel::TitleMatch& match);
 
   CancelableRequestConsumerT<int, 0> request_consumer_;
 
   // The number of times we're returned each different type of result. These are
   // used by CalculateRelevance. Initialized in Start.
   int star_title_count_;
   int star_contents_count_;
   int title_count_;
   int contents_count_;
 
   // Current autocomplete input type.
   AutocompleteInput::Type input_type_;
 
   // Results from most recent query. These are cached so we don't have to
   // re-issue queries for "minor changes" (which don't affect this provider).
   history::QueryResults results_;
 
   // Whether results_ is valid (so we can tell invalid apart from empty).
   bool have_results_;
 
   // Current query string.
   std::wstring query_;
 
   DISALLOW_EVIL_CONSTRUCTORS(HistoryContentsProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H__