Implement Material Design for Mac toolbar.

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"
 #include "chrome/browser/command_updater.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
+#import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
 #import "ui/events/event_utils.h"
 
 namespace {
 
 // Constant matches Windows.
 NSTimeInterval kPendingReloadTimeout = 1.35;
 
 // Contents of the Reload drop-down menu.
 const int kReloadMenuItems[]  = {
   IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM,
@@ skipping 53 matching lines @@
 }
 
 - (void)updateTag:(NSInteger)anInt {
   if ([self tag] == anInt)
     return;
 
   // Forcibly remove any stale tooltip which is being displayed.
   [self removeAllToolTips];
   id cell = [self cell];
   [self setTag:anInt];
+
+  // The old way of doing things.
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    if (anInt == IDC_RELOAD) {
+      [cell setImageID:IDR_RELOAD
+        forButtonState:image_button_cell::kDefaultState];
+      [cell setImageID:IDR_RELOAD_H
+        forButtonState:image_button_cell::kHoverState];
+      [cell setImageID:IDR_RELOAD_P
+        forButtonState:image_button_cell::kPressedState];
+      // The stop button has a disabled image but the reload button doesn't. To
+      // unset it we have to explicilty change the image ID to 0.
+      [cell setImageID:0
+        forButtonState:image_button_cell::kDisabledState];
+      [self setToolTip:l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_RELOAD)];
+    } else if (anInt == IDC_STOP) {
+      [cell setImageID:IDR_STOP
+        forButtonState:image_button_cell::kDefaultState];
+      [cell setImageID:IDR_STOP_H
+        forButtonState:image_button_cell::kHoverState];
+      [cell setImageID:IDR_STOP_P
+        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];
   if (anInt == IDC_RELOAD) {
-    [cell setImageID:IDR_RELOAD
-      forButtonState:image_button_cell::kDefaultState];
-    [cell setImageID:IDR_RELOAD_H
-      forButtonState:image_button_cell::kHoverState];
-    [cell setImageID:IDR_RELOAD_P
-      forButtonState:image_button_cell::kPressedState];
-    // The stop button has a disabled image but the reload button doesn't. To
-    // unset it we have to explicilty change the image ID to 0.
-    [cell setImageID:0
-      forButtonState:image_button_cell::kDisabledState];
     [self setToolTip:l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_RELOAD)];
   } else if (anInt == IDC_STOP) {
-    [cell setImageID:IDR_STOP
-      forButtonState:image_button_cell::kDefaultState];
-    [cell setImageID:IDR_STOP_H
-      forButtonState:image_button_cell::kHoverState];
-    [cell setImageID:IDR_STOP_P
-      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();
   }
 }
 
 - (id)accessibilityAttributeValue:(NSString *)attribute {
   if ([attribute isEqualToString:NSAccessibilityEnabledAttribute] &&
       pendingReloadTimer_) {
     return [NSNumber numberWithBool:NO];
   } else {
     return [super accessibilityAttributeValue:attribute];
   }
 }
 
 - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force {
   // Can always transition to stop mode.  Only transition to reload
   // mode if forced or if the mouse isn't hovering.  Otherwise, note
   // that reload mode is desired and disable the button.
   if (isLoading) {
     [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];
-    [cell setImageID:IDR_STOP_D
-      forButtonState:image_button_cell::kDefaultState];
-    [cell setImageID:IDR_STOP_D
-      forButtonState:image_button_cell::kDisabledState];
-    [cell setImageID:IDR_STOP_D
-      forButtonState:image_button_cell::kHoverState];
-    [cell setImageID:IDR_STOP_D
-      forButtonState:image_button_cell::kPressedState];
+    if (ui::MaterialDesignController::IsModeMaterial()) {
+      [self setImagesFromIconId:gfx::VectorIconId::NAVIGATE_STOP];
+      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 {
+      [cell setImageID:IDR_STOP_D
+        forButtonState:image_button_cell::kDefaultState];
+      [cell setImageID:IDR_STOP_D
+        forButtonState:image_button_cell::kDisabledState];
+      [cell setImageID:IDR_STOP_D
+        forButtonState:image_button_cell::kHoverState];
+      [cell setImageID:IDR_STOP_D
+        forButtonState:image_button_cell::kPressedState];
+    }
     pendingReloadTimer_ =
         [NSTimer timerWithTimeInterval:kPendingReloadTimeout
                                 target:self
                               selector:@selector(forceReloadState:)
                               userInfo:nil
                                repeats:NO];
     // Must add the timer to |NSRunLoopCommonModes| because
     // it should run in |NSEventTrackingRunLoopMode| as well as
     // |NSDefaultRunLoopMode|.
     [[NSRunLoop currentRunLoop] addTimer:pendingReloadTimer_
@@ skipping 90 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