Move around more vector icons.

chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #include "chrome/browser/ui/cocoa/spinner_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/l10n/l10n_util_mac.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 {
 
 // Chooser width.
 const CGFloat kChooserWidth = 390.0f;
 
 // Chooser height.
 const CGFloat kChooserHeight = 330.0f;
 
@@ skipping 105 matching lines @@
                  isConnected:(bool)isConnected
                     isPaired:(bool)isPaired
                    rowHeight:(CGFloat)rowHeight
          textNeedIndentation:(bool)textNeedIndentation {
   if ((self = [super initWithFrame:NSZeroRect])) {
     // Create the views.
     // Image.
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     NSImage* image = nullptr;
     if (isConnected) {
-      image = gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
-          gfx::VectorIconId::BLUETOOTH_CONNECTED, gfx::kChromeIconGrey));
+      image = gfx::NSImageFromImageSkia(
+          gfx::CreateVectorIcon(kBluetoothConnectedIcon, gfx::kChromeIconGrey));
     } else if (level != -1) {
       DCHECK_GE(level, 0);
       DCHECK_LT(level, base::checked_cast<NSInteger>(
                            arraysize(kSignalStrengthLevelImageIds)));
       image = rb.GetNativeImageNamed(kSignalStrengthLevelImageIds[level])
                   .ToNSImage();
     }
 
     CGFloat imageOriginX = kTableRowViewHorizontalPadding;
     CGFloat imageOriginY = (rowHeight - kRowViewImageSize) / 2;
@@ skipping 687 matching lines @@
     // Update the color of the text.
     [[self tableRowViewText:rowIndex]
         setTextColor:(isSelected ? [NSColor whiteColor]
                                  : [NSColor blackColor])];
 
     // Update the color of the image.
     if (chooserController_->ShouldShowIconBeforeText()) {
       if (chooserController_->IsConnected(rowIndex)) {
         [[self tableRowViewImage:rowIndex]
             setImage:gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
-                         gfx::VectorIconId::BLUETOOTH_CONNECTED,
+                         kBluetoothConnectedIcon,
                          isSelected ? SK_ColorWHITE : gfx::kChromeIconGrey))];
       } else {
         int signalStrengthLevel =
             chooserController_->GetSignalStrengthLevel(rowIndex);
         if (signalStrengthLevel != -1) {
           int imageId =
               isSelected
                   ? kSignalStrengthLevelImageSelectedIds[signalStrengthLevel]
                   : kSignalStrengthLevelImageIds[signalStrengthLevel];
           [[self tableRowViewImage:rowIndex]
@@ skipping 32 matching lines @@
 
 - (void)drawRect:(NSRect)rect {
   [[NSColor colorWithCalibratedWhite:245.0f / 255.0f alpha:1.0f] setFill];
   NSRect footnoteFrame =
       NSMakeRect(0.0f, 0.0f, kChooserWidth, separatorOriginY_);
   NSRectFill(footnoteFrame);
   [super drawRect:footnoteFrame];
 }
 
 @end