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

ui/message_center/cocoa/settings_entry_view.mm

 // Copyright 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/settings_entry_view.h"
 
 #include <algorithm>
 
 #include "base/strings/sys_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 38 matching lines @@
 // The amount of space we want, based on the spec and the intrinsic text space
 // included by Cocoa.
 const int kCorrectedIconTextPadding =
     kInternalHorizontalSpacing - kIntrinsicTextLeftPadding;
 
 // We want a certain amount of space to the right of the learn more button,
 // this metric incorporates the intrinsic learn more blank space to compute it.
 const int kCorrectedEntryRightPadding =
     kInternalHorizontalSpacing - kIntrinsicLearnMorePadding;
 
+////////////////////////////////////////////////////////////////////////////////
+
+@interface MCSettingsButton : NSButton
+@end
+
+@implementation MCSettingsButton
+// drawRect: needs to fill the button with a background, otherwise we don't get
+// subpixel antialiasing.
+- (void)drawRect:(NSRect)dirtyRect {
+  NSColor* color = gfx::SkColorToCalibratedNSColor(
+      message_center::kMessageCenterBackgroundColor);
+  [color set];
+  NSRectFill(dirtyRect);
+  [super drawRect:dirtyRect];
+}
+@end
+
 @interface MCSettingsButtonCell : NSButtonCell {
   // A checkbox's regular image is the checkmark image. This additional image
   // is used for the favicon or app icon shown next to the checkmark.
   base::scoped_nsobject<NSImage> extraImage_;
 }
 - (void)setExtraImage:(NSImage*)extraImage;
 @end
 
 @implementation MCSettingsButtonCell
+- (BOOL)isOpaque {
+  return YES;
+}
+
 - (void)setExtraImage:(NSImage*)extraImage {
   extraImage_.reset([extraImage retain]);
 }
 
 - (NSRect)drawTitle:(NSAttributedString*)title
           withFrame:(NSRect)frame
              inView:(NSView*)controlView {
   CGFloat inset = kCorrectedCheckmarkRightPadding;
   // drawTitle:withFrame:inView: draws the checkmark image. Draw the extra
   // image as part of the checkbox's text.
@@ skipping 48 matching lines @@
       rect.size.width += kEntryIconSize + kCorrectedIconTextPadding;
 
     if (NSPointInRect(point, rect))
       result = NSCellHitContentArea | NSCellHitTrackableArea;
   }
   return result;
 }
 @end
 
 @implementation MCSettingsEntryView
-
 - (id)initWithController:(MCSettingsController*)controller
                 notifier:(message_center::Notifier*)notifier
                    frame:(NSRect)frame
             hasSeparator:(BOOL)hasSeparator {
   if ((self = [super initWithFrame:frame])) {
     [self setBoxType:NSBoxCustom];
     [self setBorderType:NSNoBorder];
     [self setTitlePosition:NSNoTitle];
     [self setContentViewMargins:NSZeroSize];
 
@@ skipping 64 matching lines @@
     [learnMoreButton_ setHoverImage:rb.GetNativeImageNamed(
         IDR_NOTIFICATION_ADVANCED_SETTINGS_HOVER).ToNSImage()];
     [learnMoreButton_ setPressedImage:rb.GetNativeImageNamed(
         IDR_NOTIFICATION_ADVANCED_SETTINGS_PRESSED).ToNSImage()];
     [learnMoreButton_ setBordered:NO];
     [learnMoreButton_ setTarget:self];
     [learnMoreButton_ setAction:@selector(learnMoreClicked:)];
   }
 
   if (!checkbox_.get()) {
-    checkbox_.reset([[NSButton alloc] initWithFrame:checkboxFrame]);
+    checkbox_.reset([[MCSettingsButton alloc] initWithFrame:checkboxFrame]);
     [self addSubview:checkbox_];
   } else {
     [checkbox_ setFrame:checkboxFrame];
   }
 
   base::scoped_nsobject<MCSettingsButtonCell> cell([[MCSettingsButtonCell alloc]
       initTextCell:base::SysUTF16ToNSString(notifier_->name)]);
   if ([notifierIcon_ isValid])
     [cell setExtraImage:notifierIcon_];
 
@@ skipping 32 matching lines @@
 
 // Testing API /////////////////////////////////////////////////////////////////
 
 - (void)clickLearnMore {
   [learnMoreButton_ performClick:nil];
 }
 
 @end
 
 ///////////////////////////////////////////////////////////////////////////////