Make HistoryContentsProvider results deletable

chrome/browser/autocomplete/history_contents_provider.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/autocomplete/history_contents_provider.h"
 
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 133 matching lines @@
 void HistoryContentsProvider::Stop() {
   done_ = true;
   request_consumer_.CancelAllRequests();
 
   // Clear the results. We swap in an empty one as the easy way to clear it.
   history::QueryResults empty_results;
   results_.Swap(&empty_results);
   have_results_ = false;
 }
 
+void HistoryContentsProvider::DeleteMatch(const AutocompleteMatch& match) {
+  DCHECK(done_);
+  DCHECK(match.deletable);
+  DCHECK(profile_);
+
+  // Delete the match from the history DB.
+  HistoryService* const history_service =
+      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+
+  GURL selected_url(match.destination_url);
+  if (!history_service || !selected_url.is_valid()) {

[brettw, 2010/12/15 22:24:11]

This code is copied and pasted from the HistoryURLProvider. This is sort of
unfortunate. I wonder if we can have a static function in the HistoryURLProvider
(can you think of a better place? I'm not totally thrilled with it) for

static void DeleteMatchFromHistory(const AutocompleteMatch& match, ACMatches*
matches)

[msw, 2010/12/16 01:38:26]

How about using base class HistoryProvider?

+    NOTREACHED() << "Can't delete requested URL";
+    return;
+  }
+  history_service->DeleteURL(selected_url);
+
+  // Delete the match from the current set of matches.
+  bool found = false;
+  for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) {
+    if (i->destination_url == match.destination_url && i->type == match.type) {
+      found = true;
+      matches_.erase(i);
+      break;
+    }
+  }
+  DCHECK(found) << "Asked to delete a URL that isn't in our set of matches";
+
+  listener_->OnProviderUpdate(true);
+}
+
 HistoryContentsProvider::~HistoryContentsProvider() {
 }
 
 void HistoryContentsProvider::QueryComplete(HistoryService::Handle handle,
                                             history::QueryResults* results) {
   results_.AppendResultsBySwapping(results, true);
   have_results_ = true;
   ConvertResults();
 
   done_ = true;
@@ skipping 51 matching lines @@
 
 static bool MatchInTitle(const history::URLResult& result) {
   return !result.title_match_positions().empty();
 }
 
 AutocompleteMatch HistoryContentsProvider::ResultToMatch(
     const history::URLResult& result,
     int score) {
   // TODO(sky): if matched title highlight matching words in title.
   // Also show star in popup.
-  AutocompleteMatch match(this, score, false, MatchInTitle(result) ?
+  AutocompleteMatch match(this, score, true, MatchInTitle(result) ?
       AutocompleteMatch::HISTORY_TITLE : AutocompleteMatch::HISTORY_BODY);
   match.contents = StringForURLDisplay(result.url(), true, trim_http_);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(result.url(),
                                                               match.contents);
   match.destination_url = result.url();
   match.contents_class.push_back(
       ACMatchClassification(0, ACMatchClassification::URL));
   match.description = UTF16ToWide(result.title());
   match.starred =
@@ skipping 55 matching lines @@
   UMA_HISTOGRAM_TIMES("Omnibox.QueryBookmarksTime",
                       TimeTicks::Now() - start_time);
 }
 
 void HistoryContentsProvider::AddBookmarkTitleMatchToResults(
     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);
 }