Move around more vector icons.

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 "ui/gfx/vector_icons_public.h"
+#include "ui/gfx/vector_icon_types.h"
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#include "components/omnibox/browser/vector_icons.h"  // nogncheck
+#endif
 
 namespace {
 
 bool IsTrivialClassification(const ACMatchClassifications& classifications) {
   return classifications.empty() ||
       ((classifications.size() == 1) &&
        (classifications.back().style == ACMatchClassification::NONE));
 }
 
 // Returns true if one of the |terms_prefixed_by_http_or_https| matches the
@@ skipping 125 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
-gfx::VectorIconId AutocompleteMatch::TypeToVectorIcon(Type type) {
+const gfx::VectorIcon& 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
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // SEARCH_HISTORY
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // SEARCH_SUGGEST
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // SEARCH_SUGGEST_ENTITY
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // SEARCH_SUGGEST_TAIL
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PERSONALIZED
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // SEARCH_SUGGEST_PROFILE
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // SEARCH_OTHER_ENGINE
-      gfx::VectorIconId::OMNIBOX_EXTENSION_APP,  // EXTENSION_APP
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // CONTACT_DEPRECATED
-      gfx::VectorIconId::OMNIBOX_HTTP,           // BOOKMARK_TITLE
-      gfx::VectorIconId::OMNIBOX_HTTP,           // NAVSUGGEST_PERSONALIZED
-      gfx::VectorIconId::OMNIBOX_CALCULATOR,     // CALCULATOR
-      gfx::VectorIconId::OMNIBOX_HTTP,           // CLIPBOARD
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // VOICE_SEARCH
-      gfx::VectorIconId::OMNIBOX_HTTP,           // PHYSICAL_WEB
-      gfx::VectorIconId::OMNIBOX_HTTP,           // PHYSICAL_WEB_OVERFLOW
-  };
-  static_assert(arraysize(kIcons) == AutocompleteMatchType::NUM_TYPES,
-                "icons array must have NUM_TYPES elements");
-  return kIcons[type];
+  switch (type) {
+    case Type::URL_WHAT_YOU_TYPED:
+    case Type::HISTORY_URL:
+    case Type::HISTORY_TITLE:
+    case Type::HISTORY_BODY:
+    case Type::HISTORY_KEYWORD:
+    case Type::NAVSUGGEST:
+    case Type::BOOKMARK_TITLE:
+    case Type::NAVSUGGEST_PERSONALIZED:
+    case Type::CLIPBOARD:
+    case Type::PHYSICAL_WEB:
+    case Type::PHYSICAL_WEB_OVERFLOW:
+      return omnibox::kHttpIcon;
+
+    case Type::SEARCH_WHAT_YOU_TYPED:
+    case Type::SEARCH_HISTORY:
+    case Type::SEARCH_SUGGEST:
+    case Type::SEARCH_SUGGEST_ENTITY:
+    case Type::SEARCH_SUGGEST_TAIL:
+    case Type::SEARCH_SUGGEST_PERSONALIZED:
+    case Type::SEARCH_SUGGEST_PROFILE:
+    case Type::SEARCH_OTHER_ENGINE:
+    case Type::CONTACT_DEPRECATED:
+    case Type::VOICE_SUGGEST:
+      return omnibox::kSearchIcon;
+
+    case Type::EXTENSION_APP:
+      return omnibox::kExtensionAppIcon;
+
+    case Type::CALCULATOR:
+      return omnibox::kCalculatorIcon;
+
+    case Type::NUM_TYPES:
+      NOTREACHED();
+      break;
+  }
+  NOTREACHED();
+  return omnibox::kHttpIcon;
 #else
   NOTREACHED();
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
+  static const gfx::VectorIcon dummy = {};
+  return dummy;
 #endif
 }
 
 // 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) ?
@@ skipping 390 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