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"
@@ skipping 18 matching lines @@
   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;
     default:                                       return 64;

[Mark P, 2012/09/28 00:55:13]

Please look into whether you need to add something here.  (I think the answer is
probably yes.)

[mrossetti, 2012/10/02 00:44:16]

Done.

   }
 }
 
 // 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())
     autocompletions->append("j");
@@ skipping 65 matching lines @@
     providers_.push_back(new ShortcutsProvider(this, profile));
 
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if ((provider_types & AutocompleteProvider::TYPE_ZERO_SUGGEST) &&
       cl->HasSwitch(switches::kExperimentalZeroSuggestURLPrefix)) {
     zero_suggest_provider_ = new ZeroSuggestProvider(this, profile,
         cl->GetSwitchValueASCII(switches::kExperimentalZeroSuggestURLPrefix));
     providers_.push_back(zero_suggest_provider_);
   }
 
+  // Disable the BookmarkProvider if there the switch says so.
+  if ((provider_types & AutocompleteProvider::TYPE_BOOKMARK) &&
+      !cl->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);
 }