Move more vector icons into respective directories.

chrome/browser/ui/cocoa/hover_close_button.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/hover_close_button.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMKeyValueAnimation.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.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/resources/grit/ui_resources.h"
 
 namespace  {
 const CGFloat kFramesPerSecond = 16; // Determined experimentally to look good.
 const CGFloat kCloseAnimationDuration = 0.1;
 const int kTabCloseButtonSize = 16;
 
 // Strings that are used for all close buttons. Set up in +initialize.
 NSString* gBasicAccessibilityTitle = nil;
 NSString* gTooltip = nil;
@@ skipping 117 matching lines @@
 
 - (void)setFadeOutValue:(CGFloat)value {
   [self setNeedsDisplay];
 }
 
 - (TabView *)tabView {
   return base::mac::ObjCCast<TabView>([self superview]);
 }
 
 - (NSImage*)imageForHoverState:(HoverState)hoverState {
-  gfx::VectorIconId vectorIconID;
+  const gfx::VectorIcon* vectorIcon = nullptr;
   SkColor vectorIconColor = gfx::kPlaceholderColor;
   TabView* tabView = [self tabView];
 
   switch (hoverState) {
     case kHoverStateNone:
-      vectorIconID = gfx::VectorIconId::TAB_CLOSE_NORMAL;
+      vectorIcon = &kTabCloseNormalIcon;
       vectorIconColor =
           tabView ? [tabView iconColor] : tabs::kDefaultTabTextColor;
       break;
     case kHoverStateMouseOver:
       // For mouse over, the icon color is the fill color of the circle.
-      vectorIconID = gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED;
+      vectorIcon = &kTabCloseHoveredPressedIcon;
       vectorIconColor = SkColorSetARGB(0xFF, 0xDB, 0x44, 0x37);
       break;
     case kHoverStateMouseDown:
       // For mouse pressed, the icon color is the fill color of the circle.
-      vectorIconID = gfx::VectorIconId::TAB_CLOSE_HOVERED_PRESSED;
+      vectorIcon = &kTabCloseHoveredPressedIcon;
       vectorIconColor = SkColorSetARGB(0xFF, 0xA8, 0x35, 0x2A);
       break;
   }
 
   return NSImageFromImageSkia(
-      gfx::CreateVectorIcon(vectorIconID, kTabCloseButtonSize,
-          vectorIconColor));
+      gfx::CreateVectorIcon(*vectorIcon, kTabCloseButtonSize, vectorIconColor));
 }
 
 - (void)setHoverState:(HoverState)state {
   if (state != self.hoverState) {
     previousState_ = self.hoverState;
     [super setHoverState:state];
     // Only animate the HoverStateNone case and only if this is still in the
     // view hierarchy.
     if (state == kHoverStateNone && [self superview] != nil) {
       DCHECK(fadeOutAnimation_ == nil);
@@ skipping 69 matching lines @@
       break;
     case kHoverStateMouseDown:
       imageID = IDR_CLOSE_DIALOG_P;
       break;
   }
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   return bundle.GetNativeImageNamed(imageID).ToNSImage();
 }
 
 @end