Merge 264607 "Fix the remaining subpixel antialiasing bugs in th..."

ui/message_center/cocoa/tray_view_controller.mm

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ui/message_center/cocoa/tray_view_controller.h"
 
 #include <cmath>
 
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/time/time.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "skia/ext/skia_utils_mac.h"
 #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"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notifier_settings.h"
 
 const int kBackButtonSize = 16;
 
 // NSClipView subclass.
 @interface MCClipView : NSClipView {
@@ skipping 364 matching lines @@
     (message_center::TrayAnimationEndedCallback)callback {
   testingAnimationEndedCallback_.reset(Block_copy(callback));
 }
 
 // Private /////////////////////////////////////////////////////////////////////
 
 - (void)layoutControlArea {
   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 backgroundColor:color]);
 
   [title_ setFont:font];
   [title_ setStringValue:
       l10n_util::GetNSString(IDS_MESSAGE_CENTER_FOOTER_TITLE)];
   [title_ setTextColor:gfx::SkColorToCalibratedNSColor(
       message_center::kRegularTextColor)];
   [title_ sizeToFit];
 
   NSRect titleFrame = [title_ frame];
   titleFrame.origin.x = message_center::kMarginBetweenItems;
@@ skipping 110 matching lines @@
       l10n_util::GetNSString(IDS_MESSAGE_CENTER_QUIET_MODE_BUTTON_TOOLTIP)];
   [[pauseButton_ cell]
       accessibilitySetOverrideValue:[pauseButton_ toolTip]
                        forAttribute:NSAccessibilityDescriptionAttribute];
   [pauseButton_ setAction:@selector(toggleQuietMode:)];
   configureButton(pauseButton_);
   [view addSubview:pauseButton_];
 
   // 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 backgroundColor:color]);
 
   NSFont* smallFont =
       [NSFont labelFontOfSize:message_center::kEmptyCenterFontSize];
   [emptyDescription_ setFont:smallFont];
   [emptyDescription_ setStringValue:
       l10n_util::GetNSString(IDS_MESSAGE_CENTER_NO_MESSAGES)];
   [emptyDescription_ setTextColor:gfx::SkColorToCalibratedNSColor(
       message_center::kDimTextColor)];
   [emptyDescription_ sizeToFit];
   [emptyDescription_ setHidden:YES];
@@ skipping 249 matching lines @@
     [pauseButton_ setDefaultImage: rb.GetNativeImageNamed(
         IDR_NOTIFICATION_DO_NOT_DISTURB_PRESSED).ToNSImage()];
   } else {
     [pauseButton_ setTrackingEnabled:YES];
     [pauseButton_ setDefaultImage:
         rb.GetNativeImageNamed(IDR_NOTIFICATION_DO_NOT_DISTURB).ToNSImage()];
   }
 }
 
 @end