Omnibox: Bug Fixes for Reverse Title

components/omnibox/autocomplete_match.cc

 // 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.
 
 #include "components/omnibox/autocomplete_match.h"
 
-#include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/omnibox/autocomplete_provider.h"
-#include "components/omnibox/omnibox_switches.h"
 #include "components/omnibox/suggestion_answer.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "grit/components_scaled_resources.h"
 
 namespace {
 
 bool IsTrivialClassification(const ACMatchClassifications& classifications) {
   return classifications.empty() ||
       ((classifications.size() == 1) &&
@@ skipping 11 matching lines @@
   0x2029,  // Paragraph separator
   0
 };
 
 AutocompleteMatch::AutocompleteMatch()
     : provider(NULL),
       relevance(0),
       typed_count(-1),
       deletable(false),
       allowed_to_be_default_match(false),
+      swap_contents_and_description(false),
       transition(ui::PAGE_TRANSITION_GENERATED),
       type(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED),
       from_previous(false) {
 }
 
 AutocompleteMatch::AutocompleteMatch(AutocompleteProvider* provider,
                                      int relevance,
                                      bool deletable,
                                      Type type)
     : provider(provider),
       relevance(relevance),
       typed_count(-1),
       deletable(deletable),
       allowed_to_be_default_match(false),
+      swap_contents_and_description(false),
       transition(ui::PAGE_TRANSITION_TYPED),
       type(type),
       from_previous(false) {
 }
 
 AutocompleteMatch::AutocompleteMatch(const AutocompleteMatch& match)
     : provider(match.provider),
       relevance(match.relevance),
       typed_count(match.typed_count),
       deletable(match.deletable),
       fill_into_edit(match.fill_into_edit),
       inline_autocompletion(match.inline_autocompletion),
       allowed_to_be_default_match(match.allowed_to_be_default_match),
       destination_url(match.destination_url),
       stripped_destination_url(match.stripped_destination_url),
       contents(match.contents),
       contents_class(match.contents_class),
       description(match.description),
       description_class(match.description_class),
+      swap_contents_and_description(match.swap_contents_and_description),
       answer_contents(match.answer_contents),
       answer_type(match.answer_type),
       answer(SuggestionAnswer::copy(match.answer.get())),
       transition(match.transition),
       type(match.type),
       associated_keyword(match.associated_keyword.get() ?
           new AutocompleteMatch(*match.associated_keyword) : NULL),
       keyword(match.keyword),
       from_previous(match.from_previous),
       search_terms_args(match.search_terms_args.get() ?
@@ skipping 17 matching lines @@
   deletable = match.deletable;
   fill_into_edit = match.fill_into_edit;
   inline_autocompletion = match.inline_autocompletion;
   allowed_to_be_default_match = match.allowed_to_be_default_match;
   destination_url = match.destination_url;
   stripped_destination_url = match.stripped_destination_url;
   contents = match.contents;
   contents_class = match.contents_class;
   description = match.description;
   description_class = match.description_class;
+  swap_contents_and_description = match.swap_contents_and_description;
   answer_contents = match.answer_contents;
   answer_type = match.answer_type;
   answer = SuggestionAnswer::copy(match.answer.get());
   transition = match.transition;
   type = match.type;
   associated_keyword.reset(match.associated_keyword.get() ?
       new AutocompleteMatch(*match.associated_keyword) : NULL);
   keyword = match.keyword;
   from_previous = match.from_previous;
   search_terms_args.reset(match.search_terms_args.get() ?
@@ skipping 193 matching lines @@
     int style) {
   DCHECK(classifications);
   if (classifications->empty() || classifications->back().style != style) {
     DCHECK(classifications->empty() ||
            (offset > classifications->back().offset));
     classifications->push_back(ACMatchClassification(offset, style));
   }
 }
 
 // static
+bool AutocompleteMatch::HasMatchStyle(
+    const ACMatchClassifications& classifications) {
+  for (const auto& it : classifications) {
+    if (it.style & AutocompleteMatch::ACMatchClassification::MATCH)
+      return true;
+  }
+  return false;
+}
+
+// static
 base::string16 AutocompleteMatch::SanitizeString(const base::string16& text) {
   // NOTE: This logic is mirrored by |sanitizeString()| in
   // omnibox_custom_bindings.js.
   base::string16 result;
   base::TrimWhitespace(text, base::TRIM_LEADING, &result);
   base::RemoveChars(result, kInvalidChars, &result);
   return result;
 }
 
 // static
@@ skipping 179 matching lines @@
     return true;
 
   for (ACMatches::const_iterator it(duplicate_matches.begin());
        it != duplicate_matches.end(); ++it) {
     if (it->deletable)
       return true;
   }
   return false;
 }
 
-void AutocompleteMatch::PossiblySwapContentsAndDescriptionForURLSuggestion(
-    const AutocompleteInput& input) {
-  if (!IsSearchType(type) && !description.empty() &&
-      base::CommandLine::ForCurrentProcess()->
-          HasSwitch(switches::kEmphasizeTitlesInOmniboxDropdown) &&
-      ((input.type() == metrics::OmniboxInputType::QUERY) ||
-       (input.type() == metrics::OmniboxInputType::FORCED_QUERY))) {
+void AutocompleteMatch::PossiblySwapContentsAndDescriptionForDisplay() {
+  if (swap_contents_and_description) {
     std::swap(contents, description);
     std::swap(contents_class, description_class);
   }
 }
 
 #ifndef NDEBUG
 void AutocompleteMatch::Validate() const {
   ValidateClassifications(contents, contents_class);
   ValidateClassifications(description, description_class);
 }
@@ skipping 23 matching lines @@
         << " is unsorted in relation to last offset of " << last_offset
         << ". Provider: " << provider_name << ".";
     DCHECK_LT(i->offset, text.length())
         << " Classification of [" << i->offset << "," << text.length()
         << "] is out of bounds for \"" << text << "\". Provider: "
         << provider_name << ".";
     last_offset = i->offset;
   }
 }
 #endif