Omnibox: Bug Fixes for Shortcuts Inlining

chrome/browser/autocomplete/history_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_HISTORY_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_H_
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/history/in_memory_url_index_types.h"
 
 class AutocompleteInput;
 struct AutocompleteMatch;
 
 // This class is a base class for the history autocomplete providers and
 // provides functions useful to all derived classes.
 class HistoryProvider : public AutocompleteProvider {
  public:
   virtual void DeleteMatch(const AutocompleteMatch& match) OVERRIDE;
 
- protected:
-  HistoryProvider(AutocompleteProviderListener* listener,
-                  Profile* profile,
-                  AutocompleteProvider::Type type);
-  virtual ~HistoryProvider();
-
-  // Finds and removes the match from the current collection of matches and
-  // backing data.
-  void DeleteMatchFromMatches(const AutocompleteMatch& match);
-
   // Fixes up user URL input to make it more possible to match against.  Among
   // many other things, this takes care of the following:
   // * Prepending file:// to file URLs
   // * Converting drive letters in file URLs to uppercase
   // * Converting case-insensitive parts of URLs (like the scheme and domain)
   //   to lowercase
   // * Convert spaces to %20s
   // Note that we don't do this in AutocompleteInput's constructor, because if
   // e.g. we convert a Unicode hostname to punycode, other providers will show
   // output that surprises the user ("Search Google for xn--6ca.com").
   // Returns false if the fixup attempt resulted in an empty string (which
   // providers generally can't do anything with).
   static bool FixupUserInput(AutocompleteInput* input);

[Mark P, 2013/12/17 22:52:40]

This is a simple cut-and-paste of FixupUserInput from the protected section to
the public section.  The diff highlighting is icky.

 
+ protected:
+  HistoryProvider(AutocompleteProviderListener* listener,
+                  Profile* profile,
+                  AutocompleteProvider::Type type);
+  virtual ~HistoryProvider();
+
+  // Finds and removes the match from the current collection of matches and
+  // backing data.
+  void DeleteMatchFromMatches(const AutocompleteMatch& match);
+
   // Trims "http:" and up to two subsequent slashes from |url|.  Returns the
   // number of characters that were trimmed.
   // NOTE: For a view-source: URL, this will trim from after "view-source:" and
   // return 0.
   static size_t TrimHttpPrefix(base::string16* url);
 
   // Returns true if inline autocompletion should be prevented. Use this instead
   // of |input.prevent_inline_autocomplete| if the input is passed through
   // FixupUserInput(). This method returns true if
   // |input.prevent_inline_autocomplete()| is true or the input text contains
   // trailing whitespace.
   bool PreventInlineAutocomplete(const AutocompleteInput& input);
 
   // Fill and return an ACMatchClassifications structure given the |matches|
   // to highlight.
   static ACMatchClassifications SpansFromTermMatch(
       const history::TermMatches& matches,
       size_t text_length,
       bool is_url);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_H_