Index: chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm |
diff --git a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm |
index 5adff27b035e0015e2f1f7e8562aff33567cfe0e..925bc4002ae740e119450c275ed69c2a6498256e 100644 |
--- a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm |
+++ b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm |
@@ -89,39 +89,8 @@ - (void)updateTag:(NSInteger)anInt { |
// 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 resetButtonStateImages]; |
if (anInt == IDC_RELOAD) { |
[self setToolTip:l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_RELOAD)]; |
@@ -154,28 +123,16 @@ - (void)setIsLoading:(BOOL)isLoading force:(BOOL)force { |
} else if ([self tag] == IDC_STOP && |
!pendingReloadTimer_ && |
[[self cell] isMouseInside]) { |
- id cell = [self cell]; |
- if (ui::MaterialDesignController::IsModeMaterial()) { |
- [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 { |
- [cell setImageID:IDR_STOP_D |
+ [self resetButtonStateImages]; |
+ NSImage* disabledStopImage = |
+ [[self cell] imageForState:image_button_cell::kDisabledState |
+ view:self]; |
+ [[self cell] setImage:disabledStopImage |
forButtonState:image_button_cell::kDefaultState]; |
- [cell setImageID:IDR_STOP_D |
- forButtonState:image_button_cell::kDisabledState]; |
- [cell setImageID:IDR_STOP_D |
+ [[self cell] setImage:disabledStopImage |
forButtonState:image_button_cell::kHoverState]; |
- [cell setImageID:IDR_STOP_D |
+ [[self cell] setImage:disabledStopImage |
forButtonState:image_button_cell::kPressedState]; |
- } |
pendingReloadTimer_ = |
[NSTimer timerWithTimeInterval:kPendingReloadTimeout |
target:self |