Reland crrev.com/8283cad74e0cad4840d1f with fix for static initializers.

chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm

 // Copyright (c) 2011 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/toolbar/toolbar_button_cocoa.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
 
@@ skipping 178 matching lines @@
   return handleMiddleClick_ && [theEvent buttonNumber] == 2;
 }
 
 - (void)drawFocusRingMask {
   // Match the hover image's bezel.
   [[NSBezierPath bezierPathWithRoundedRect:NSInsetRect([self bounds], 2, 2)
                                    xRadius:2
                                    yRadius:2] fill];
 }
 
-- (gfx::VectorIconId)vectorIconId {
+- (const gfx::VectorIcon*)vectorIcon {
   BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
   switch ([self viewID]) {
     case VIEW_ID_BACK_BUTTON:
-      return isRTL ? gfx::VectorIconId::NAVIGATE_FORWARD
-                   : gfx::VectorIconId::NAVIGATE_BACK;
+      return isRTL ? &kNavigateForwardIcon : &kNavigateBackIcon;
     case VIEW_ID_FORWARD_BUTTON:
-      return isRTL ? gfx::VectorIconId::NAVIGATE_BACK
-                   : gfx::VectorIconId::NAVIGATE_FORWARD;
+      return isRTL ? &kNavigateBackIcon : &kNavigateForwardIcon;
     case VIEW_ID_HOME_BUTTON:
-      return gfx::VectorIconId::NAVIGATE_HOME;
+      return &kNavigateHomeIcon;
     case VIEW_ID_APP_MENU:
-      return gfx::VectorIconId::BROWSER_TOOLS;
+      return &kBrowserToolsIcon;
     default:
       break;
   }
 
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
+  return nullptr;
 }
 
 - (SkColor)vectorIconColor:(BOOL)themeIsDark {
   return themeIsDark ? SK_ColorWHITE : SkColorSetRGB(0x5A, 0x5A, 0x5A);
 }
 
 - (NSImage*)browserToolsIconForFillColor:(SkColor)fillColor {
   // Create a |BrowserToolsImageRep| to draw the browser tools icon using
   // the provided fill color.
   base::scoped_nsobject<BrowserToolsImageRep> imageRep(
@@ skipping 44 matching lines @@
   // ivar.
   image_.reset([anImage retain]);
   [self resetButtonStateImages];
 }
 
 - (void)resetButtonStateImages {
   NSImage* normalIcon = nil;
   NSImage* disabledIcon = nil;
   BOOL isDarkTheme = NO;
 
-  gfx::VectorIconId iconId = [self vectorIconId];
-  if (iconId == gfx::VectorIconId::VECTOR_ICON_NONE) {
-    // If the button does not have a vector icon id (e.g. it's an extension
+  const gfx::VectorIcon* icon = [self vectorIcon];
+  if (!icon) {
+    // If the button does not have a vector icon (e.g. it's an extension
     // button), use its image. The hover, etc. images will be created using
     // imageForIcon:withBackgroundStyle: so do the same for the default image.
     // If we don't do this, the icon may not appear in the same place as in the
     // other states, causing the icon to appear to shift as you mouse over the
     // button.
     NSImage* defaultImage =
         [self imageForIcon:[self image]
               withBackgroundStyle:ToolbarButtonImageBackgroundStyle::DEFAULT];
     normalIcon = disabledIcon = defaultImage;
   } else {
     // Compute the normal and disabled vector icon colors.
     isDarkTheme = [[self window] hasDarkTheme];
     const SkColor vectorIconColor = [self vectorIconColor:isDarkTheme];
     CGFloat normalAlpha = isDarkTheme ? 0xCC : 0xFF;
     const SkColor normalColor = SkColorSetA(vectorIconColor, normalAlpha);
     const SkColor disabledColor = SkColorSetA(vectorIconColor, 0x33);
 
     // Create the normal and disabled state icons. These icons are always the
     // same shape but use a different color.
-    if (iconId == gfx::VectorIconId::BROWSER_TOOLS) {
+    if (icon == &kBrowserToolsIcon) {
       normalIcon = [self browserToolsIconForFillColor:normalColor];
       disabledIcon = [self browserToolsIconForFillColor:disabledColor];
     } else {
       normalIcon = NSImageFromImageSkia(
-          gfx::CreateVectorIcon(iconId,
+          gfx::CreateVectorIcon(*icon,
                                 kMDButtonIconSize.width,
                                 normalColor));
 
       // The home button has no icon for its disabled state.
-      if (iconId != gfx::VectorIconId::NAVIGATE_RELOAD) {
+      if (icon != &kNavigateReloadIcon) {
         disabledIcon = NSImageFromImageSkia(
-            gfx::CreateVectorIcon(iconId,
+            gfx::CreateVectorIcon(*icon,
                                   kMDButtonIconSize.width,
                                   disabledColor));
       }
     }
   }
 
   ImageButtonCell* theCell = base::mac::ObjCCast<ImageButtonCell>([self cell]);
   // Set the image for the default state, which is just the icon.
   [theCell setImage:normalIcon forButtonState:image_button_cell::kDefaultState];
 
@@ skipping 44 matching lines @@
 
 - (void)windowDidChangeTheme {
   // Update the hover and pressed image backgrounds to match the current theme.
   [self resetButtonStateImages];
 }
 
 - (void)windowDidChangeActive {
 }
 
 @end