Omnibox: Bug Fixes for Reverse Title

components/omnibox/autocomplete_result.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_result.h"
 
 #include <algorithm>
 #include <iterator>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_provider.h"
 #include "components/omnibox/omnibox_field_trial.h"
+#include "components/omnibox/omnibox_switches.h"
 #include "components/search/search.h"
 #include "components/url_fixer/url_fixer.h"
 
 using metrics::OmniboxEventProto;
 
 namespace {
 
 // This class implements a special version of AutocompleteMatch::MoreRelevant
 // that allows matches of particular types to be demoted in AutocompleteResult.
 class CompareWithDemoteByType {
@@ skipping 135 matching lines @@
 
 void AutocompleteResult::AppendMatches(const AutocompleteInput& input,
                                        const ACMatches& matches) {
   for (const auto& i : matches) {
 #ifndef NDEBUG
     DCHECK_EQ(AutocompleteMatch::SanitizeString(i.contents), i.contents);
     DCHECK_EQ(AutocompleteMatch::SanitizeString(i.description),
               i.description);
 #endif
     matches_.push_back(i);
-    matches_.back().PossiblySwapContentsAndDescriptionForURLSuggestion(input);
+    if (!AutocompleteMatch::IsSearchType(i.type) && !i.description.empty() &&
+        base::CommandLine::ForCurrentProcess()->
+            HasSwitch(switches::kEmphasizeTitlesInOmniboxDropdown) &&
+        ((input.type() == metrics::OmniboxInputType::QUERY) ||
+         (input.type() == metrics::OmniboxInputType::FORCED_QUERY)) &&
+        AutocompleteMatch::HasMatchStyle(i.description_class)) {
+      matches_.back().swap_contents_and_description = true;
+    }
   }
   default_match_ = end();
   alternate_nav_url_ = GURL();
 }
 
 void AutocompleteResult::SortAndCull(
     const AutocompleteInput& input,
     TemplateURLService* template_url_service) {
   for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i)
     i->ComputeStrippedDestinationURL(template_url_service);
@@ skipping 253 matching lines @@
        i != old_matches.rend() && delta > 0; ++i) {
     if (!HasMatchByDestination(*i, new_matches)) {
       AutocompleteMatch match = *i;
       match.relevance = std::min(max_relevance, match.relevance);
       match.from_previous = true;
       matches_.push_back(match);
       delta--;
     }
   }
 }