| 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 5344268fed69634acfe967f21e11d69ba3e1db26..af803d2137142e87062e468a90332ea74aa62db0 100644
|
| --- a/ui/message_center/cocoa/tray_view_controller.mm
|
| +++ b/ui/message_center/cocoa/tray_view_controller.mm
|
| @@ -14,6 +14,7 @@
|
| #import "ui/base/cocoa/hover_image_button.h"
|
| #include "ui/base/l10n/l10n_util_mac.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| +#import "ui/message_center/cocoa/opaque_views.h"
|
| #import "ui/message_center/cocoa/notification_controller.h"
|
| #import "ui/message_center/cocoa/settings_controller.h"
|
| #include "ui/message_center/message_center.h"
|
| @@ -398,19 +399,11 @@ const CGFloat kTrayBottomMargin = 75;
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| NSView* view = [self view];
|
|
|
| - auto configureLabel = ^(NSTextField* textField) {
|
| - [textField setAutoresizingMask:NSViewMinYMargin];
|
| - [textField setBezeled:NO];
|
| - [textField setBordered:NO];
|
| - [textField setDrawsBackground:NO];
|
| - [textField setEditable:NO];
|
| - [textField setSelectable:NO];
|
| - };
|
| -
|
| // Create the "Notifications" label at the top of the tray.
|
| NSFont* font = [NSFont labelFontOfSize:message_center::kTitleFontSize];
|
| - title_.reset([[NSTextField alloc] initWithFrame:NSZeroRect]);
|
| - configureLabel(title_);
|
| + NSColor* color = gfx::SkColorToCalibratedNSColor(
|
| + message_center::kMessageCenterBackgroundColor);
|
| + title_.reset([[MCTextField alloc] initWithFrame:NSZeroRect andColor:color]);
|
|
|
| [title_ setFont:font];
|
| [title_ setStringValue:
|
| @@ -541,8 +534,8 @@ const CGFloat kTrayBottomMargin = 75;
|
|
|
| // Create the description field for the empty message center. Initially it is
|
| // invisible.
|
| - emptyDescription_.reset([[NSTextField alloc] initWithFrame:NSZeroRect]);
|
| - configureLabel(emptyDescription_);
|
| + emptyDescription_.reset(
|
| + [[MCTextField alloc] initWithFrame:NSZeroRect andColor:color]);
|
|
|
| NSFont* smallFont =
|
| [NSFont labelFontOfSize:message_center::kEmptyCenterFontSize];
|
|
|