Omnibox - Add About Flag to Reverse Title and URLs in the Dropdown

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 493 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) {
+  // For URL suggestions, swap contents and description on query-type inputs
+  // if legal (under the constraint that contents must be non-empty) and
+  // we're supposed to (due to about:flags).

[Peter Kasting, 2015/05/21 21:55:33]

Nit: I think this comment just restates the (fairly clear) code, so I'd omit it.

[Mark P, 2015/05/22 22:51:29]

Okay, removed.  I only added the comment because I thought one item in this if
clause was not obvious: the fact that we need to check that description is not
empty.

If you think need is obvious (it wasn't to me; I originally wrote the code
without that test), then we're good.  If not, can you suggest a comment?

+  if (!IsSearchType(type) && !description.empty() &&
+      base::CommandLine::ForCurrentProcess()->
+          HasSwitch(switches::kEmphasizeTitlesInOmniboxDropdown) &&
+      ((input.type() == metrics::OmniboxInputType::QUERY) ||
+       (input.type() == metrics::OmniboxInputType::FORCED_QUERY))) {
+    std::swap(contents, description);
+    std::swap(contents_class, description_class);
+  }
+}
+
 #ifndef NDEBUG
 void AutocompleteMatch::Validate() const {
   ValidateClassifications(contents, contents_class);
   ValidateClassifications(description, description_class);
 }
 
 void AutocompleteMatch::ValidateClassifications(
     const base::string16& text,
     const ACMatchClassifications& classifications) const {
   if (text.empty()) {
@@ skipping 18 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