Chromium Code Reviews| 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..78b457aee5494cb9ff5980013a2cc98a06f29b88 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,40 @@ const CGFloat kMargin = 5; |
| - (int)getTrayResourceId { |
| BOOL highlight = [self shouldHighlight]; |
| BOOL hasUnreadItems = unreadCount_ > 0; |
| - int kResourceIds[2][2][2] = { |
| + BOOL dark = NO; |
| + if ([self respondsToSelector:@selector(effectiveAppearance)]) { |
| + NSString* appearanceName = [[self effectiveAppearance] name]; |
| + dark = (appearanceName != nil) && |
|
Robert Sesek
2014/09/12 19:16:23
You can drop the nil check. Messaging nil will alw
dewittj
2014/09/12 23:24:20
Done.
|
| + [appearanceName isEqualToString:NSAppearanceNameVibrantDark]; |
| + } |
| + |
| + int kResourceIds[2][2][2][2] = { |
|
dewittj
2014/09/12 18:15:36
Wondering now if I should use a bitmask to index i
Robert Sesek
2014/09/12 19:16:23
I'd be fine with either. Your call.
dewittj
2014/09/12 23:24:20
Acknowledged.
|
| { |
| - { 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 |