Upstream iOS specific design for omnibox

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/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 117 matching lines @@
   from_previous = match.from_previous;
   search_terms_args.reset(match.search_terms_args.get() ?
       new TemplateURLRef::SearchTermsArgs(*match.search_terms_args) : NULL);
   additional_info = match.additional_info;
   duplicate_matches = match.duplicate_matches;
   return *this;
 }
 
 // static
 int AutocompleteMatch::TypeToIcon(Type type) {
-  int icons[] = {
-    IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_EXTENSION_APP,
-    IDR_OMNIBOX_SEARCH,
-    IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_HTTP,
-    IDR_OMNIBOX_SEARCH,
+#if !defined(OS_IOS)
+  static const int kIcons[] = {
+      IDR_OMNIBOX_HTTP,           // URL_WHAT_YOU_TYPE
+      IDR_OMNIBOX_HTTP,           // HISTORY_URL
+      IDR_OMNIBOX_HTTP,           // HISTORY_TITLE
+      IDR_OMNIBOX_HTTP,           // HISTORY_BODY
+      IDR_OMNIBOX_HTTP,           // HISTORY_KEYWORD
+      IDR_OMNIBOX_HTTP,           // NAVSUGGEST
+      IDR_OMNIBOX_SEARCH,         // SEARCH_WHAT_YOU_TYPED
+      IDR_OMNIBOX_SEARCH,         // SEARCH_HISTORY
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ENTITY
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_INFINITE
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PERSONALIZED
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PROFILE
+      IDR_OMNIBOX_SEARCH,         // SEARCH_OTHER_ENGINE
+      IDR_OMNIBOX_EXTENSION_APP,  // EXTENSION_APP
+      IDR_OMNIBOX_SEARCH,         // CONTACT_DEPRECATED
+      IDR_OMNIBOX_HTTP,           // BOOKMARK_TITLE
+      IDR_OMNIBOX_HTTP,           // NAVSUGGEST_PERSONALIZED
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ANSWER
   };
-  static_assert(arraysize(icons) == AutocompleteMatchType::NUM_TYPES,
+#else
+  static const int kIcons[] = {
+      IDR_OMNIBOX_HTTP,           // URL_WHAT_YOU_TYPE
+      IDR_OMNIBOX_HISTORY,        // HISTORY_URL
+      IDR_OMNIBOX_HISTORY,        // HISTORY_TITLE
+      IDR_OMNIBOX_HISTORY,        // HISTORY_BODY
+      IDR_OMNIBOX_HISTORY,        // HISTORY_KEYWORD
+      IDR_OMNIBOX_HTTP,           // NAVSUGGEST
+      IDR_OMNIBOX_SEARCH,         // SEARCH_WHAT_YOU_TYPED
+      IDR_OMNIBOX_HISTORY,        // SEARCH_HISTORY
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ENTITY
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_INFINITE
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PERSONALIZED
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PROFILE
+      IDR_OMNIBOX_SEARCH,         // SEARCH_OTHER_ENGINE
+      IDR_OMNIBOX_EXTENSION_APP,  // EXTENSION_APP
+      IDR_OMNIBOX_SEARCH,         // CONTACT_DEPRECATED
+      IDR_OMNIBOX_HTTP,           // BOOKMARK_TITLE
+      IDR_OMNIBOX_HTTP,           // NAVSUGGEST_PERSONALIZED
+      IDR_OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ANSWER
+  };
+#endif
+  static_assert(arraysize(kIcons) == AutocompleteMatchType::NUM_TYPES,
                 "icons array must have NUM_TYPES elements");
-  return icons[type];
+  return kIcons[type];
 }
 
 // static
 bool AutocompleteMatch::MoreRelevant(const AutocompleteMatch& elem1,
                                      const AutocompleteMatch& elem2) {
   // For equal-relevance matches, we sort alphabetically, so that providers
   // who return multiple elements at the same priority get a "stable" sort
   // across multiple updates.
   return (elem1.relevance == elem2.relevance) ?
       (elem1.contents < elem2.contents) : (elem1.relevance > elem2.relevance);
@@ skipping 365 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