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

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

Issue 564953002: Add support for dark theme in Mac Notification Center (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge. Created 6 years, 3 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/status_item_view.mm
diff --git a/ui/message_center/cocoa/status_item_view.mm b/ui/message_center/cocoa/status_item_view.mm
index 166de9fa3182a71a1050bb655c1df4ea0d3050a6..ef826c97ffe77042f5adc37717e76199b7afcc06 100644
--- a/ui/message_center/cocoa/status_item_view.mm
+++ b/ui/message_center/cocoa/status_item_view.mm
@@ -7,6 +7,7 @@
#include <cmath>
#include "base/format_macros.h"
+#include "base/mac/sdk_forward_declarations.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/resources/grit/ui_resources.h"
@@ -148,19 +149,43 @@ const CGFloat kMargin = 5;
- (int)getTrayResourceId {
BOOL highlight = [self shouldHighlight];
BOOL hasUnreadItems = unreadCount_ > 0;
- int kResourceIds[2][2][2] = {
+ BOOL dark = NO;
+
+ Class<CrNSAppearance> nsAppearanceClass = NSClassFromString(@"NSAppearance");
+ if ([self respondsToSelector:@selector(effectiveAppearance)] &&
+ [nsAppearanceClass respondsToSelector:@selector(appearanceNamed:)]) {
Robert Sesek 2014/09/15 16:36:02 And this should be +instancesRespondToSelector:, w
dewittj 2014/09/15 17:32:37 Done.
+ id<NSObject> darkAppearance = [nsAppearanceClass
+ appearanceNamed:NSAppearanceNameVibrantDark];
Robert Sesek 2014/09/15 16:36:02 nit: indent +4
dewittj 2014/09/15 17:32:37 Done.
+ dark = [[self effectiveAppearance] isEqual:darkAppearance];
+ }
+
+ int kResourceIds[2][2][2][2] = {
{
- { IDR_TRAY_EMPTY, IDR_TRAY_EMPTY_PRESSED },
- { IDR_TRAY_ATTENTION, IDR_TRAY_ATTENTION_PRESSED },
+ {
+ { IDR_TRAY_EMPTY, IDR_TRAY_EMPTY_PRESSED },
+ { IDR_TRAY_ATTENTION, IDR_TRAY_ATTENTION_PRESSED },
+ },
+ {
+ { IDR_TRAY_DO_NOT_DISTURB_EMPTY,
+ IDR_TRAY_DO_NOT_DISTURB_EMPTY_PRESSED },
+ { IDR_TRAY_DO_NOT_DISTURB_ATTENTION,
+ IDR_TRAY_DO_NOT_DISTURB_ATTENTION_PRESSED },
+ },
},
{
- { IDR_TRAY_DO_NOT_DISTURB_EMPTY,
- IDR_TRAY_DO_NOT_DISTURB_EMPTY_PRESSED },
- { IDR_TRAY_DO_NOT_DISTURB_ATTENTION,
- IDR_TRAY_DO_NOT_DISTURB_ATTENTION_PRESSED },
- },
+ {
+ { IDR_DARK_TRAY_EMPTY, IDR_DARK_TRAY_EMPTY_PRESSED },
+ { IDR_DARK_TRAY_ATTENTION, IDR_DARK_TRAY_ATTENTION_PRESSED },
+ },
+ {
+ { IDR_DARK_TRAY_DO_NOT_DISTURB_EMPTY,
+ IDR_DARK_TRAY_DO_NOT_DISTURB_EMPTY_PRESSED },
+ { IDR_DARK_TRAY_DO_NOT_DISTURB_ATTENTION,
+ IDR_DARK_TRAY_DO_NOT_DISTURB_ATTENTION_PRESSED },
+ },
+ }
};
- return kResourceIds[quietMode_][hasUnreadItems][highlight];
+ return kResourceIds[dark][quietMode_][hasUnreadItems][highlight];
}
@end

Powered by Google App Engine
This is Rietveld 408576698