Update extension buttons to Material Design (Mac).

chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.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/toolbar/reload_button_cocoa.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 104 matching lines @@
         forButtonState:image_button_cell::kPressedState];
       [cell setImageID:IDR_STOP_D
         forButtonState:image_button_cell::kDisabledState];
       [self setToolTip:l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STOP)];
     } else {
       NOTREACHED();
     }
     return;
   }
 
-  [self resetIcons];
+  [self resetButtonStateImages];
   if (anInt == IDC_RELOAD) {
     [self setToolTip:l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_RELOAD)];
   } else if (anInt == IDC_STOP) {
     [self setToolTip:l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STOP)];
   } else {
     NOTREACHED();
   }
 }
 
 - (id)accessibilityAttributeValue:(NSString *)attribute {
@@ skipping 13 matching lines @@
     [self invalidatePendingReloadTimer];
     [self updateTag:IDC_STOP];
   } else if (force) {
     [self invalidatePendingReloadTimer];
     [self updateTag:IDC_RELOAD];
   } else if ([self tag] == IDC_STOP &&
              !pendingReloadTimer_ &&
              [[self cell] isMouseInside]) {
     id cell = [self cell];
     if (ui::MaterialDesignController::IsModeMaterial()) {
-      [self setImagesFromIconId:gfx::VectorIconId::NAVIGATE_STOP];
+      [self resetButtonStateImages];
       NSImage* disabledStopImage =
           [[self cell] imageForState:image_button_cell::kDisabledState
                                 view:self];
       [cell setImage:disabledStopImage
           forButtonState:image_button_cell::kDefaultState];
       [cell setImage:disabledStopImage
           forButtonState:image_button_cell::kHoverState];
       [cell setImage:disabledStopImage
           forButtonState:image_button_cell::kPressedState];
     } else {
@@ skipping 59 matching lines @@
     }
   }
 
   return [super sendAction:theAction to:theTarget];
 }
 
 - (ViewID)viewID {
   return VIEW_ID_RELOAD_BUTTON;
 }
 
+- (gfx::VectorIconId)vectorIconId {
+  if ([self tag] == IDC_RELOAD) {
+    return gfx::VectorIconId::NAVIGATE_RELOAD;
+  } else if ([self tag] == IDC_STOP) {
+    return gfx::VectorIconId::NAVIGATE_STOP;
+  } else {
+    NOTREACHED();
+  }
+
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+}
+
 - (void)mouseInsideStateDidChange:(BOOL)isInside {
   [pendingReloadTimer_ fire];
 }
 
 - (void)populateMenu {
   [menu_ setAutoenablesItems:NO];
   // 0-th item must be blank. (This is because we use a pulldown list, for which
   // Cocoa uses the 0-th item as "title" in the button.)
   [menu_ addItemWithTitle:@""
                    action:nil
@@ skipping 30 matching lines @@
 - (void)executeMenuItem:(id)sender {
   if (!commandUpdater_)
     return;
   DCHECK([sender isKindOfClass:[NSMenuItem class]]);
   int command = [sender tag];
   int event_flags = ui::EventFlagsFromNative([NSApp currentEvent]);
   commandUpdater_->ExecuteCommandWithDisposition(
       command, ui::DispositionFromEventFlags(event_flags));
 }
 
-- (void)resetIcons {
-  if ([self tag] == IDC_RELOAD) {
-    [self setImagesFromIconId:gfx::VectorIconId::NAVIGATE_RELOAD];
-  } else if ([self tag] == IDC_STOP) {
-    [self setImagesFromIconId:gfx::VectorIconId::NAVIGATE_STOP];
-  } else {
-    NOTREACHED();
-  }
-}
-
-- (void)viewDidMoveToWindow {
-  // If a dark theme in Material Design, make sure the icon is the correct
-  // color.
-  if ([self window] && ui::MaterialDesignController::IsModeMaterial() &&
-      [[self window] hasDarkTheme]) {
-    [self resetIcons];
-  }
-}
-
 @end  // ReloadButton
 
 @implementation ReloadButton (Testing)
 
 + (void)setPendingReloadTimeout:(NSTimeInterval)seconds {
   kPendingReloadTimeout = seconds;
 }
 
 @end