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

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/logging.h"
@@ skipping 143 matching lines @@
   old_matches.BuildProviderToMatches(&old_matches_per_provider);
   for (ProviderToMatches::const_iterator i(old_matches_per_provider.begin());
        i != old_matches_per_provider.end(); ++i) {
     MergeMatchesByProvider(input.current_page_classification(),
                            i->second, matches_per_provider[i->first]);
   }
 
   SortAndCull(input, template_url_service);
 }
 
-void AutocompleteResult::AppendMatches(const ACMatches& matches) {
+void AutocompleteResult::AppendMatches(const AutocompleteInput& input,
+                                       const ACMatches& matches) {
+  for (ACMatches::const_iterator i(matches.begin()); i != matches.end(); ++i) {

[Peter Kasting, 2015/05/22 23:39:36]

Nit: Range-based for?

[Mark P, 2015/05/23 20:32:13]

Okay.  Done.

 #ifndef NDEBUG
-  for (ACMatches::const_iterator i(matches.begin()); i != matches.end(); ++i) {
     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);
   }
-#endif
-  std::copy(matches.begin(), matches.end(), std::back_inserter(matches_));
   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 257 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--;
     }
   }
 }