Omnibox refactor. OmniboxController now holds an AutocompleteMatch.

chrome/browser/autocomplete/autocomplete_result.cc

 // Copyright (c) 2012 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 "chrome/browser/autocomplete/autocomplete_result.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 116 matching lines @@
 
   // Sort and trim to the most relevant kMaxMatches matches.
   const size_t num_matches = std::min(kMaxMatches, matches_.size());
   std::partial_sort(matches_.begin(), matches_.begin() + num_matches,
                     matches_.end(), &AutocompleteMatch::MoreRelevant);
   matches_.resize(num_matches);
 
   default_match_ = begin();
 
   // Set the alternate nav URL.
-  alternate_nav_url_ = GURL();
-  if (input.type() == AutocompleteInput::UNKNOWN &&
-      default_match_ != end() &&
-      AutocompleteMatch::IsSearchType(default_match_->type) &&
-      default_match_->transition != content::PAGE_TRANSITION_KEYWORD &&
-      input.canonicalized_url() != default_match_->destination_url)
-    alternate_nav_url_ = input.canonicalized_url();
+  alternate_nav_url_ = default_match_ == end() ? GURL() :

[Peter Kasting, 2013/06/18 17:44:00]

Nit: Wrap after '?' instead of ':'.  Put parens around binary subexpression.

[beaudoin, 2013/06/18 22:37:34]

Done.

+      ComputeAlternateNavUrl(input, *default_match_);
 }
 
 bool AutocompleteResult::HasCopiedMatches() const {
   for (ACMatches::const_iterator i(begin()); i != end(); ++i) {
     if (i->from_previous)
       return true;
   }
   return false;
 }
 
@@ skipping 47 matching lines @@
   alternate_nav_url_.Swap(&(other->alternate_nav_url_));
 }
 
 #ifndef NDEBUG
 void AutocompleteResult::Validate() const {
   for (const_iterator i(begin()); i != end(); ++i)
     i->Validate();
 }
 #endif
 
+// static
+GURL AutocompleteResult::ComputeAlternateNavUrl(
+    const AutocompleteInput& input,
+    const AutocompleteMatch& match) {
+  return (input.type() == AutocompleteInput::UNKNOWN &&

[Peter Kasting, 2013/06/18 17:44:00]

Nit: Parens around binary subexpressions

[beaudoin, 2013/06/18 22:37:34]

Done.

+          AutocompleteMatch::IsSearchType(match.type) &&
+          match.transition != content::PAGE_TRANSITION_KEYWORD &&
+          input.canonicalized_url() != match.destination_url) ?
+      input.canonicalized_url() : GURL();
+}
+
 void AutocompleteResult::BuildProviderToMatches(
     ProviderToMatches* provider_to_matches) const {
   for (ACMatches::const_iterator i(begin()); i != end(); ++i)
     (*provider_to_matches)[i->provider].push_back(*i);
 }
 
 // static
 bool AutocompleteResult::HasMatchByDestination(const AutocompleteMatch& match,
                                                const ACMatches& matches) {
   for (ACMatches::const_iterator i(matches.begin()); i != matches.end(); ++i) {
@@ skipping 21 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;
       AddMatch(match);
       delta--;
     }
   }
 }