Implement Bookmark Autocomplete Provider

chrome/browser/autocomplete/autocomplete_controller.cc

 // Copyright (c) 2012 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/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
+#include "chrome/browser/autocomplete/bookmark_provider.h"
 #include "chrome/browser/autocomplete/builtin_provider.h"
 #include "chrome/browser/autocomplete/extension_app_provider.h"
 #include "chrome/browser/autocomplete/history_contents_provider.h"
 #include "chrome/browser/autocomplete/history_quick_provider.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/autocomplete/shortcuts_provider.h"
 #include "chrome/browser/autocomplete/zero_suggest_provider.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/autocomplete/contact_provider_chromeos.h"
 #include "chrome/browser/chromeos/contacts/contact_manager.h"
 #endif
 
 namespace {
 
 // Converts the given type to an integer based on the AQS specification.
 // For more details, See http://goto.google.com/binary-clients-logging .
 int AutocompleteMatchToAssistedQueryType(const AutocompleteMatch::Type& type) {
   switch (type) {
     case AutocompleteMatch::SEARCH_SUGGEST:        return 0;
     case AutocompleteMatch::NAVSUGGEST:            return 5;
     case AutocompleteMatch::SEARCH_WHAT_YOU_TYPED: return 57;
     case AutocompleteMatch::URL_WHAT_YOU_TYPED:    return 58;
     case AutocompleteMatch::SEARCH_HISTORY:        return 59;
     case AutocompleteMatch::HISTORY_URL:           return 60;
     case AutocompleteMatch::HISTORY_TITLE:         return 61;
     case AutocompleteMatch::HISTORY_BODY:          return 62;
     case AutocompleteMatch::HISTORY_KEYWORD:       return 63;
+    case AutocompleteMatch::BOOKMARK_TITLE:        return 65;
+    // NOTE: Default is equivalent to OMNIBOX_OTHER and must remain 64.

[Peter Kasting, 2012/10/04 20:40:31]

OMNIBOX_OTHER?  What is that?

[mrossetti, 2012/10/05 22:10:04]

Please see email sent separately.

     default:                                       return 64;
   }
 }
 
 // Appends available autocompletion of the given type and number to the existing
 // available autocompletions string, encoding according to the spec.
 void AppendAvailableAutocompletion(int type,
                                    int count,
                                    std::string* autocompletions) {
   if (!autocompletions->empty())
@@ skipping 65 matching lines @@
   if (provider_types & AutocompleteProvider::TYPE_SHORTCUTS)
     providers_.push_back(new ShortcutsProvider(this, profile));
 
   // Create ZeroSuggest if it is enabled.
   if (provider_types & AutocompleteProvider::TYPE_ZERO_SUGGEST) {
     zero_suggest_provider_ = ZeroSuggestProvider::Create(this, profile);
     if (zero_suggest_provider_)
       providers_.push_back(zero_suggest_provider_);
   }
 
+  // Disable the BookmarkProvider if there the switch says so.

[Peter Kasting, 2012/10/04 20:40:31]

Nit: Comment adds nothing

[mrossetti, 2012/10/05 22:10:04]

Done. (I was just following the pattern used for ZeroSuggest.)

+  if ((provider_types & AutocompleteProvider::TYPE_BOOKMARK) &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableBookmarkAutocompleteProvider))
+    providers_.push_back(new BookmarkProvider(this, profile));
+
   for (ACProviders::iterator i(providers_.begin()); i != providers_.end(); ++i)
     (*i)->AddRef();
 }
 
 AutocompleteController::~AutocompleteController() {
   // The providers may have tasks outstanding that hold refs to them.  We need
   // to ensure they won't call us back if they outlive us.  (Practically,
   // calling Stop() should also cancel those tasks and make it so that we hold
   // the only refs.)  We also don't want to bother notifying anyone of our
   // result changes here, because the notification observer is in the midst of
@@ skipping 312 matching lines @@
   }
   done_ = true;
 }
 
 void AutocompleteController::StartExpireTimer() {
   if (result_.HasCopiedMatches())
     expire_timer_.Start(FROM_HERE,
                         base::TimeDelta::FromMilliseconds(kExpireTimeMS),
                         this, &AutocompleteController::ExpireCopiedEntries);
 }