Move around more vector icons.

chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 #include "chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
+#include "components/toolbar/vector_icons.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_mac.h"
 
 using autofill::AutofillPopupView;
 using autofill::AutofillPopupLayoutModel;
 
 @interface AutofillPopupViewCocoa ()
 
 #pragma mark -
 #pragma mark Private methods
@@ skipping 246 matching lines @@
 - (NSImage*)iconAtIndex:(size_t)index {
   const int kHttpWarningIconWidth = 16;
   const base::string16& icon = controller_->GetSuggestionAt(index).icon;
   if (icon.empty())
     return nil;
 
   // For the Form-Not-Secure warning about password/credit card fields on HTTP
   // pages, reuse the omnibox vector icons.
   if (icon == base::ASCIIToUTF16("httpWarning")) {
     return NSImageFromImageSkiaWithColorSpace(
-        gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTP,
-                              kHttpWarningIconWidth, gfx::kChromeIconGrey),
+        gfx::CreateVectorIcon(toolbar::kHttpIcon, kHttpWarningIconWidth,
+                              gfx::kChromeIconGrey),
         base::mac::GetSRGBColorSpace());
   }
 
   if (icon == base::ASCIIToUTF16("httpsInvalid")) {
     return NSImageFromImageSkiaWithColorSpace(
-        gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID,
-                              kHttpWarningIconWidth, gfx::kGoogleRed700),
+        gfx::CreateVectorIcon(toolbar::kHttpsInvalidIcon, kHttpWarningIconWidth,
+                              gfx::kGoogleRed700),
         base::mac::GetSRGBColorSpace());
   }
 
   int iconId = delegate_->GetIconResourceID(icon);
   DCHECK_NE(-1, iconId);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(iconId).ToNSImage();
 }
 
 @end