Use vector icon for Ash shelf launcher

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"
@@ skipping 214 matching lines @@
 // 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
-      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::SEARCH,                 // SEARCH_WHAT_YOU_TYPED
+      gfx::VectorIconId::SEARCH,                 // SEARCH_HISTORY
+      gfx::VectorIconId::SEARCH,                 // SEARCH_SUGGEST
+      gfx::VectorIconId::SEARCH,                 // SEARCH_SUGGEST_ENTITY
+      gfx::VectorIconId::SEARCH,                 // SEARCH_SUGGEST_TAIL
+      gfx::VectorIconId::SEARCH,                 // SEARCH_SUGGEST_PERSONALIZED
+      gfx::VectorIconId::SEARCH,                 // SEARCH_SUGGEST_PROFILE
+      gfx::VectorIconId::SEARCH,                 // SEARCH_OTHER_ENGINE
       gfx::VectorIconId::OMNIBOX_EXTENSION_APP,  // EXTENSION_APP
-      gfx::VectorIconId::OMNIBOX_SEARCH,         // CONTACT_DEPRECATED
+      gfx::VectorIconId::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::SEARCH,                 // VOICE_SEARCH
   };
   static_assert(arraysize(kIcons) == AutocompleteMatchType::NUM_TYPES,
                 "icons array must have NUM_TYPES elements");
   return kIcons[type];
 #else
   NOTREACHED();
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 #endif
 }
 
@@ skipping 397 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