Omnibox: Add Shortcuts as InstantExtended Provider

chrome/browser/autocomplete/autocomplete_classifier.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_classifier.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "googleurl/src/gurl.h"
 
 // static
 const int AutocompleteClassifier::kDefaultOmniboxProviders =
     AutocompleteProvider::TYPE_BOOKMARK |
     AutocompleteProvider::TYPE_BUILTIN |
     AutocompleteProvider::TYPE_HISTORY_QUICK |
     AutocompleteProvider::TYPE_HISTORY_URL |
     AutocompleteProvider::TYPE_KEYWORD |
     AutocompleteProvider::TYPE_SEARCH |
     AutocompleteProvider::TYPE_SHORTCUTS |
     AutocompleteProvider::TYPE_ZERO_SUGGEST;
 
 // static
 const int AutocompleteClassifier::kInstantExtendedOmniboxProviders =

[Jered, 2013/06/21 22:50:57]

Since this is now identical to kDefaultOmniboxProviders, can we just use that?

[Peter Kasting, 2013/06/21 22:53:10]

See Mark's CL description: "For now, I left the framework that allows
InstantExtended to use a different set of providers. I'll leave it up to Jered
or Brett to decide if they're ready to get rid of it."

It makes sense to remove this if you don't think the provider sets will differ
in the future.  If they will, we might as well leave this.

     AutocompleteProvider::TYPE_BOOKMARK |
     AutocompleteProvider::TYPE_BUILTIN |
     AutocompleteProvider::TYPE_HISTORY_QUICK |
     AutocompleteProvider::TYPE_HISTORY_URL |
     AutocompleteProvider::TYPE_KEYWORD |
     // TODO: remove TYPE_SEARCH once it's no longer needed to pass
     // the Instant suggestion through via FinalizeInstantQuery.
     AutocompleteProvider::TYPE_SEARCH |
+    AutocompleteProvider::TYPE_SHORTCUTS |
     AutocompleteProvider::TYPE_ZERO_SUGGEST;
 
 AutocompleteClassifier::AutocompleteClassifier(Profile* profile)
     : controller_(new AutocompleteController(profile, NULL,
                                              kDefaultOmniboxProviders)),
       inside_classify_(false) {
 }
 
 AutocompleteClassifier::~AutocompleteClassifier() {
   // We should only reach here after Shutdown() has been called.
@@ skipping 20 matching lines @@
 
   DCHECK(result.default_match() != result.end());
   *match = *result.default_match();
   if (alternate_nav_url)
     *alternate_nav_url = result.alternate_nav_url();
 }
 
 void AutocompleteClassifier::Shutdown() {
   controller_.reset();
 }