Enabled pressing TAB to cycle through the Omnibox results.

chrome/browser/autocomplete/autocomplete_match.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "grit/theme_resources.h"
 
 // AutocompleteMatch ----------------------------------------------------------
 
@@ skipping 19 matching lines @@
       deletable(deletable),
       inline_autocomplete_offset(string16::npos),
       transition(PageTransition::TYPED),
       is_history_what_you_typed_match(false),
       type(type),
       template_url(NULL),
       starred(false),
       from_previous(false) {
 }
 
+AutocompleteMatch::AutocompleteMatch(const AutocompleteMatch& match)
+    : provider(match.provider),
+      relevance(match.relevance),
+      deletable(match.deletable),
+      inline_autocomplete_offset(match.inline_autocomplete_offset),
+      transition(match.transition),
+      is_history_what_you_typed_match(match.is_history_what_you_typed_match),
+      type(match.type),
+      keyword(match.keyword),
+      template_url(match.template_url),
+      starred(match.starred),
+      from_previous(match.from_previous),
+      fill_into_edit(match.fill_into_edit),
+      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) {
+  if (match.associated_keyword.get())
+    associated_keyword.reset(new AutocompleteMatch(*match.associated_keyword));
+}
+
 AutocompleteMatch::~AutocompleteMatch() {
 }
 
+AutocompleteMatch& AutocompleteMatch::operator=(
+    const AutocompleteMatch& match) {
+  if (this == &match)
+    return *this;
+
+  provider = match.provider;
+  relevance = match.relevance;
+  deletable = match.deletable;
+  inline_autocomplete_offset = match.inline_autocomplete_offset;
+  transition = match.transition;
+  is_history_what_you_typed_match = match.is_history_what_you_typed_match;
+  type = match.type;
+  keyword = match.keyword;
+  template_url = match.template_url;
+  starred = match.starred;
+  from_previous = match.from_previous;
+  fill_into_edit = match.fill_into_edit;
+  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;
+
+  if (match.associated_keyword.get())

[Peter Kasting, 2011/07/27 20:18:25]

Nit: Shorter:

  associated_keyword.reset(match.associated_keyword.get() ?
      new AutocompleteMatch(*match.associated_keyword) : NULL);

+    associated_keyword.reset(new AutocompleteMatch(*match.associated_keyword));
+  else
+    associated_keyword.reset(NULL);
+
+  return *this;
+}
+
 // static
 std::string AutocompleteMatch::TypeToString(Type type) {
   const char* strings[] = {
     "url-what-you-typed",
     "history-url",
     "history-title",
     "history-body",
     "history-keyword",
     "navsuggest",
     "search-what-you-typed",
@@ skipping 38 matching lines @@
 
   return elem1.relevance > elem2.relevance;
 }
 
 // static
 bool AutocompleteMatch::DestinationSortFunc(const AutocompleteMatch& elem1,
                                             const AutocompleteMatch& elem2) {
   // Sort identical destination_urls together.  Place the most relevant matches
   // first, so that when we call std::unique(), these are the ones that get
   // preserved.
-  return (elem1.destination_url != elem2.destination_url) ?
-      (elem1.destination_url < elem2.destination_url) :
+  return (elem1.stripped_destination_url != elem2.stripped_destination_url) ?
+      (elem1.stripped_destination_url < elem2.stripped_destination_url) :
       MoreRelevant(elem1, elem2);
 }
 
 // static
 bool AutocompleteMatch::DestinationsEqual(const AutocompleteMatch& elem1,
                                           const AutocompleteMatch& elem2) {
-  return elem1.destination_url == elem2.destination_url;
+  return elem1.stripped_destination_url == elem2.stripped_destination_url;
 }
 
 // static
 void AutocompleteMatch::ClassifyMatchInString(
     const string16& find_text,
     const string16& text,
     int style,
     ACMatchClassifications* classification) {
   ClassifyLocationInString(text.find(find_text), find_text.length(),
                            text.length(), style, classification);
@@ skipping 29 matching lines @@
   classification->push_back(ACMatchClassification(match_location,
       (style | ACMatchClassification::MATCH) & ~ACMatchClassification::DIM));
 
   // Mark post-match portion of string (if any).
   const size_t after_match(match_location + match_length);
   if (after_match < overall_length) {
     classification->push_back(ACMatchClassification(after_match, style));
   }
 }
 
+void AutocompleteMatch::ComputeStrippedDestinationURL() {
+  static const char prefix[] = "www.";
+  static const size_t prefix_len = arraysize(prefix) - 1;
+
+  std::string host = destination_url.host();
+  if (destination_url.is_valid() && host.compare(0, prefix_len, prefix) == 0) {
+      host = host.substr(prefix_len);
+      GURL::Replacements replace_host;
+      replace_host.SetHostStr(host);
+      stripped_destination_url =
+          destination_url.ReplaceComponents(replace_host);
+  } else {
+    stripped_destination_url = destination_url;
+  }
+}
+
 #ifndef NDEBUG
 void AutocompleteMatch::Validate() const {
   ValidateClassifications(contents, contents_class);
   ValidateClassifications(description, description_class);
 }
 
 void AutocompleteMatch::ValidateClassifications(
     const string16& text,
     const ACMatchClassifications& classifications) const {
   if (text.empty()) {
@@ skipping 10 matching lines @@
   // The classifications should always be sorted.
   size_t last_offset = classifications[0].offset;
   for (ACMatchClassifications::const_iterator i(classifications.begin() + 1);
        i != classifications.end(); ++i) {
     DCHECK(i->offset > last_offset) << "Classification unsorted";
     DCHECK(i->offset < text.length()) << "Classification out of bounds";
     last_offset = i->offset;
   }
 }
 #endif