Omnibox: Bug Fixes for Reverse Title

components/omnibox/autocomplete_match.h

 // Copyright 2014 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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_
 #define COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 135 matching lines @@
       const std::string& serialized_classifications);
 
   // Adds a classification to the end of |classifications| iff its style is
   // different from the last existing classification.  |offset| must be larger
   // than the offset of the last classification in |classifications|.
   static void AddLastClassificationIfNecessary(
       ACMatchClassifications* classifications,
       size_t offset,
       int style);
 
+  // Returns true if at least one style in |classifications| is of type MATCH.
+  static bool HasMatch(const ACMatchClassifications& classifications);

[Peter Kasting, 2015/06/23 22:57:05]

Nit: HasMatchStyle() would be slightly clearer.

[Mark P, 2015/06/24 03:52:45]

Done.

+
   // Removes invalid characters from |text|. Should be called on strings coming
   // from external sources (such as extensions) before assigning to |contents|
   // or |description|.
   static base::string16 SanitizeString(const base::string16& text);
 
   // Convenience function to check if |type| is a search (as opposed to a URL or
   // an extension).
   static bool IsSearchType(Type type);
 
   // Convenience function to check if |type| is a special search suggest type -
@@ skipping 90 matching lines @@
   // is not shown.
   bool IsVerbatimType() const;
 
   // Returns whether this match or any duplicate of this match can be deleted.
   // This is used to decide whether we should call DeleteMatch().
   bool SupportsDeletion() const;
 
   // Swaps the contents and description fields, and their associated
   // classifications, if this is a match for which we should emphasize the
   // title (stored in the description field) over the URL (in the contents
-  // field).  See the implementation for the conditions under which this is
-  // true.
-  void PossiblySwapContentsAndDescriptionForURLSuggestion(
-      const AutocompleteInput& input);
+  // field).  Intended to only be used at the UI level before displaying, lest
+  // other omnibox systems get confused about which is which.  See the code
+  // that sets |swap_contents_and_description| for conditions under which
+  // it is true.
+  void PossiblySwapContentsAndDescriptionForDisplay();
 
   // The provider of this match, used to remember which provider the user had
   // selected when the input changes. This may be NULL, in which case there is
   // no provider (or memory of the user's selection).
   AutocompleteProvider* provider;
 
   // The relevance of this match. See table in autocomplete.h for scores
   // returned by various providers. This is used to rank matches among all
   // responding providers, so different providers must be carefully tuned to
   // supply matches with appropriate relevance.
@@ skipping 40 matching lines @@
   GURL stripped_destination_url;
 
   // The main text displayed in the address bar dropdown.
   base::string16 contents;
   ACMatchClassifications contents_class;
 
   // Additional helper text for each entry, such as a title or description.
   base::string16 description;
   ACMatchClassifications description_class;
 
+  // If true, UI-level code should swap the contents and description fields
+  // before displaying.
+  bool swap_contents_and_description;
+
   // TODO(jdonnelly): Remove the first two properties once the downstream
   // clients are using the SuggestionAnswer.
   // A rich-format version of the display for the dropdown.
   base::string16 answer_contents;
   base::string16 answer_type;
   scoped_ptr<SuggestionAnswer> answer;
 
   // The transition type to use when the user opens this match.  By default
   // this is TYPED.  Providers whose matches do not look like URLs should set
   // it to GENERATED.
@@ skipping 54 matching lines @@
       const base::string16& text,
       const ACMatchClassifications& classifications) const;
 #endif
 };
 
 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification;
 typedef std::vector<ACMatchClassification> ACMatchClassifications;
 typedef std::vector<AutocompleteMatch> ACMatches;
 
 #endif  // COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_