Revert of Delete pre-MD code from OmniboxResultView

components/omnibox/browser/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/browser/autocomplete_match.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/suggestion_answer.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/url_formatter/url_formatter.h"
+#include "grit/components_scaled_resources.h"
 #include "ui/gfx/vector_icons_public.h"
 
 namespace {
 
 bool IsTrivialClassification(const ACMatchClassifications& classifications) {
   return classifications.empty() ||
       ((classifications.size() == 1) &&
        (classifications.back().style == ACMatchClassification::NONE));
 }
 
@@ skipping 126 matching lines @@
   keyword = match.keyword;
   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) {
+#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_TAIL
+      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_CALCULATOR,     // CALCULATOR
+      IDR_OMNIBOX_HTTP,           // CLIPBOARD
+      IDR_OMNIBOX_SEARCH,         // VOICE_SEARCH
+      IDR_OMNIBOX_HTTP,           // PHYSICAL_WEB
+      IDR_OMNIBOX_HTTP,           // PHYSICAL_WEB_OVERFLOW
+  };
+#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_TAIL
+      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_CALCULATOR,     // CALCULATOR
+      IDR_OMNIBOX_HTTP,           // CLIPBOARD
+      IDR_OMNIBOX_SEARCH,         // VOICE_SEARCH
+      IDR_OMNIBOX_HTTP,           // PHYSICAL_WEB
+      IDR_OMNIBOX_HTTP,           // PHYSICAL_WEB_OVERFLOW
+  };
+#endif
+  static_assert(arraysize(kIcons) == AutocompleteMatchType::NUM_TYPES,
+                "icons array must have NUM_TYPES elements");
+  return kIcons[type];
+}
+
+// static
 gfx::VectorIconId AutocompleteMatch::TypeToVectorIcon(Type type) {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   static const gfx::VectorIconId kIcons[] = {
       gfx::VectorIconId::OMNIBOX_HTTP,           // URL_WHAT_YOU_TYPE
       gfx::VectorIconId::OMNIBOX_HTTP,           // HISTORY_URL
       gfx::VectorIconId::OMNIBOX_HTTP,           // HISTORY_TITLE
       gfx::VectorIconId::OMNIBOX_HTTP,           // HISTORY_BODY
       gfx::VectorIconId::OMNIBOX_HTTP,           // HISTORY_KEYWORD
       gfx::VectorIconId::OMNIBOX_HTTP,           // NAVSUGGEST
       gfx::VectorIconId::OMNIBOX_SEARCH,         // SEARCH_WHAT_YOU_TYPED
@@ skipping 423 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