Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1011)

Unified Diff: ui/message_center/cocoa/tray_view_controller.mm

Issue 16098012: [Mac] Reimplement HoverButton and HoverImageButton using NSButton.state. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nonatomic, assign Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/message_center/cocoa/tray_view_controller.mm
diff --git a/ui/message_center/cocoa/tray_view_controller.mm b/ui/message_center/cocoa/tray_view_controller.mm
index 98f378c88307c2f2d54ca65449e09788d81f21c8..128c6dfa048ca970c5db3b2e8fddd05ef4fd78fa 100644
--- a/ui/message_center/cocoa/tray_view_controller.mm
+++ b/ui/message_center/cocoa/tray_view_controller.mm
@@ -178,17 +178,12 @@ const CGFloat kTrayBottomMargin = 75;
}
- (void)toggleQuietMode:(id)sender {
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
if (messageCenter_->IsQuietMode()) {
messageCenter_->SetQuietMode(false);
[pauseButton_ setTrackingEnabled:YES];
- [pauseButton_ setDefaultImage:
- rb.GetNativeImageNamed(IDR_NOTIFICATION_PAUSE).ToNSImage()];
} else {
messageCenter_->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
[pauseButton_ setTrackingEnabled:NO];
- [pauseButton_ setDefaultImage:
- rb.GetNativeImageNamed(IDR_NOTIFICATION_PAUSE_PRESSED).ToNSImage()];
}
}
@@ -315,6 +310,7 @@ const CGFloat kTrayBottomMargin = 75;
NSMinX(clearAllButtonFrame) - kButtonXMargin,
defaultImage);
pauseButton_.reset([[HoverImageButton alloc] initWithFrame:pauseButtonFrame]);
+ [pauseButton_ setButtonType:NSToggleButton];
[pauseButton_ setDefaultImage:defaultImage];
[pauseButton_ setHoverImage:
rb.GetNativeImageNamed(IDR_NOTIFICATION_PAUSE_HOVER).ToNSImage()];
« chrome/browser/ui/cocoa/hover_close_button.mm ('K') | « ui/base/cocoa/hover_image_button.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698