Move around more vector icons.

components/omnibox/browser/autocomplete_match.h

 // 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.
 
 #ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_
 #define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 10 matching lines @@
 class AutocompleteProvider;
 class SuggestionAnswer;
 class TemplateURL;
 class TemplateURLService;
 
 namespace base {
 class Time;
 }  // namespace base
 
 namespace gfx {
-enum class VectorIconId;
+struct VectorIcon;
 }  // namespace gfx
 
 const char kACMatchPropertyInputText[] = "input text";
 const char kACMatchPropertyContentsPrefix[] = "match contents prefix";
 const char kACMatchPropertyContentsStartIndex[] = "match contents start index";
 
 // AutocompleteMatch ----------------------------------------------------------
 
 // A single result line with classified spans.  The autocomplete popup displays
 // the 'contents' and the 'description' (the description is optional) in the
@@ skipping 60 matching lines @@
                     int relevance,
                     bool deletable,
                     Type type);
   AutocompleteMatch(const AutocompleteMatch& match);
   ~AutocompleteMatch();
 
   // Converts |type| to a string representation.  Used in logging and debugging.
   AutocompleteMatch& operator=(const AutocompleteMatch& match);
 
   // Gets the vector icon identifier for the icon to be shown for |type|.
-  static gfx::VectorIconId TypeToVectorIcon(Type type);
+  static const gfx::VectorIcon& TypeToVectorIcon(Type type);
 
   // Comparison function for determining when one match is better than another.
   static bool MoreRelevant(const AutocompleteMatch& elem1,
                            const AutocompleteMatch& elem2);
 
   // Comparison function for removing matches with duplicate destinations.
   // Destinations are compared using |stripped_destination_url|.  Pairs of
   // matches with empty destinations are treated as differing, since empty
   // destinations are expected for non-navigable matches.
   static bool DestinationsEqual(const AutocompleteMatch& elem1,
@@ skipping 297 matching lines @@
       const base::string16& text,
       const ACMatchClassifications& classifications) const;
 #endif
 };
 
 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification;
 typedef std::vector<ACMatchClassification> ACMatchClassifications;
 typedef std::vector<AutocompleteMatch> ACMatches;
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_