Move around more vector icons.

chrome/browser/ui/autofill/autofill_popup_layout_model.cc

 // Copyright (c) 2016 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 "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "components/grit/components_scaled_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
+
+#if !defined(OS_ANDROID)
+#include "components/toolbar/vector_icons.h"  // nogncheck
+#endif
 
 namespace autofill {
 
 namespace {
 
 // The vertical height of each row in pixels.
 const size_t kRowHeight = 24;
 
 // The vertical height of a separator in pixels.
 const size_t kSeparatorHeight = 1;
@@ skipping 164 matching lines @@
       return ui::NativeTheme::kColorId_ResultsTableNormalDimmedText;
     default:
       return ui::NativeTheme::kColorId_ResultsTableNormalText;
   }
 }
 
 gfx::ImageSkia AutofillPopupLayoutModel::GetIconImage(size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   const base::string16& icon_str = suggestions[index].icon;
 
-  // For http warning message, get icon images from VectorIconId, which is the
+  // For http warning message, get icon images from VectorIcon, which is the
   // same as security indicator icons in location bar.
   if (suggestions[index].frontend_id ==
       POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE) {
     if (icon_str == base::ASCIIToUTF16("httpWarning")) {
-      return gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTP,
-                                   kHttpWarningIconWidth, gfx::kChromeIconGrey);
+      return gfx::CreateVectorIcon(toolbar::kHttpIcon, kHttpWarningIconWidth,
+                                   gfx::kChromeIconGrey);
     }
     DCHECK_EQ(icon_str, base::ASCIIToUTF16("httpsInvalid"));
-    return gfx::CreateVectorIcon(gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID,
+    return gfx::CreateVectorIcon(toolbar::kHttpsInvalidIcon,
                                  kHttpWarningIconWidth, gfx::kGoogleRed700);
   }
 
   // For other suggestion entries, get icon from PNG files.
   int icon_id = GetIconResourceID(icon_str);
   DCHECK_NE(-1, icon_id);
   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon_id);
 }
 #endif
 
@@ skipping 60 matching lines @@
 unsigned int AutofillPopupLayoutModel::GetDropdownItemHeight() const {
   return GetPopupDropdownItemHeight();
 }
 
 bool AutofillPopupLayoutModel::IsIconAtStart(int frontend_id) const {
   return frontend_id == POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE ||
       (is_credit_card_popup_ && IsIconInCreditCardPopupAtStart());
 }
 
 }  // namespace autofill