Omnibox - Do Not Allow HTTP/HTTPS Equivalence if User Explicitly Entered A Scheme

chrome/browser/autocomplete/shortcuts_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 34 matching lines @@
 
   // ShortcutsBackendObserver:
   void OnShortcutsLoaded() override;
 
   // Performs the autocomplete matching and scoring.
   void GetMatches(const AutocompleteInput& input);
 
   // Returns an AutocompleteMatch corresponding to |shortcut|. Assigns it
   // |relevance| score in the process, and highlights the description and
   // contents against |input|, which should be the lower-cased version of
-  // the user's input. |input| and |fixed_up_input_text| are used to decide
-  // what can be inlined.
+  // the user's input. |input|, |fixed_up_input_text|, and |words|  are used

[Peter Kasting, 2015/06/06 01:31:23]

Nit: Extra space

[Mark P, 2015/06/09 19:29:38]

Now obsolete.

+  // to decide what can be inlined.

[Peter Kasting, 2015/06/06 01:31:23]

Nit: You might want to just give one sentence on how these things are used or
what the overall inlineability goal is supposed to be.

[Mark P, 2015/06/09 19:29:38]

Now (mostly) obsolete, or at least not relevant to this changelist.

   AutocompleteMatch ShortcutToACMatch(
       const ShortcutsDatabase::Shortcut& shortcut,
       int relevance,
       const AutocompleteInput& input,
-      const base::string16& fixed_up_input_text);
+      const base::string16& fixed_up_input_text,
+      const std::vector<base::string16>& words);

[Peter Kasting, 2015/06/06 01:31:23]

Nit: I kinda feel like ComputeStrippedDestinationURL() should define a typedef
for this if it wants other people using this type, and we should use that here
and elsewhere.

[Mark P, 2015/06/09 19:29:38]

Now obsolete.

 
   // Returns a map mapping characters to groups of words from |text| that start
   // with those characters, ordered lexicographically descending so that longer
   // words appear before their prefixes (if any) within a particular
   // equal_range().
   static WordMap CreateWordMapForString(const base::string16& text);
 
   // Given |text| and a corresponding base set of classifications
   // |original_class|, adds ACMatchClassification::MATCH markers for all
   // instances of the words from |find_words| within |text| and returns the
@@ skipping 32 matching lines @@
 
   // The default max relevance unless overridden by a field trial.
   static const int kShortcutsProviderDefaultMaxRelevance;
 
   Profile* profile_;
   std::string languages_;
   bool initialized_;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_PROVIDER_H_