Migrate more vector icons to chrome/.

chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.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 <Cocoa/Cocoa.h>
 
 #include "base/auto_reset.h"
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #import "ui/base/cocoa/find_pasteboard.h"
 #import "ui/base/cocoa/focus_tracker.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.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"
 
 using content::NativeWebKeyboardEvent;
 
 const float kFindBarOpenDuration = 0.2;
 const float kFindBarCloseDuration = 0.15;
 const float kFindBarMoveDuration = 0.15;
 const float kRightEdgeOffset = 25;
 
 
@@ skipping 81 matching lines @@
        IDS_FIND_IN_PAGE_CLOSE_TOOLTIP)];
   [previousButton_ setToolTip:l10n_util::GetNSString(
        IDS_FIND_IN_PAGE_PREVIOUS_TOOLTIP)];
   [nextButton_ setToolTip:l10n_util::GetNSString(
        IDS_FIND_IN_PAGE_NEXT_TOOLTIP)];
 
   [closeButton_ setTitle:l10n_util::GetNSString(IDS_ACCNAME_CLOSE)];
   [previousButton_ setTitle:l10n_util::GetNSString(IDS_ACCNAME_PREVIOUS)];
   [nextButton_ setTitle:l10n_util::GetNSString(IDS_ACCNAME_NEXT)];
 
-  NSImage* image = NSImageFromImageSkia(
-      gfx::CreateVectorIcon(gfx::VectorIconId::FIND_NEXT, SK_ColorBLACK));
+  NSImage* image =
+      NSImageFromImageSkia(gfx::CreateVectorIcon(kFindNext, SK_ColorBLACK));

[sky, 2017/01/12 16:21:34]

Shouldn't this and the next be kCaretDown and kCaretUp?

[Evan Stade, 2017/01/12 16:29:47]

yes. Bit of a brain fart. It's rare that I post a change that doesn't have at
least one patchset labeled "fix mac".

   [image setTemplate:YES];
   [nextButton_ setImage:image];
 
-  image = NSImageFromImageSkia(
-      gfx::CreateVectorIcon(gfx::VectorIconId::FIND_PREV, SK_ColorBLACK));
+  image = NSImageFromImageSkia(gfx::CreateVectorIcon(kFindPrev, SK_ColorBLACK));
   [image setTemplate:YES];
   [previousButton_ setImage:image];
 
   [findBarView_ setFrame:[self hiddenFindBarFrame]];
   defaultWidth_ = NSWidth([findBarView_ frame]);
   [[self view] setHidden:YES];
 
   [self prepopulateText:[[FindPasteboard sharedInstance] findText]];
 }
 
@@ skipping 503 matching lines @@
 }
 
 - (BrowserWindowController*)browserWindowController {
   if (!browser_)
     return nil;
   return [BrowserWindowController
       browserWindowControllerForWindow:browser_->window()->GetNativeWindow()];
 }
 
 @end