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

ui/message_center/cocoa/settings_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/settings_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util.h"
+#import "ui/message_center/cocoa/opaque_views.h"
 #import "ui/message_center/cocoa/settings_entry_view.h"
 #import "ui/message_center/cocoa/tray_view_controller.h"
 #include "ui/message_center/message_center_style.h"
 
 using message_center::settings::kHorizontalMargin;
 using message_center::settings::kEntryHeight;
 
 // Intrinsic padding pixels out of our control.
 const int kIntrinsicHeaderTextTopPadding = 3;
 const int kIntrinsicSubheaderTextTopPadding = 5;
@@ skipping 71 matching lines @@
 }
 
 - (void)dealloc {
   provider_->RemoveObserver(observer_.get());
   provider_->OnNotifierSettingsClosing();
   STLDeleteElements(&notifiers_);
   [super dealloc];
 }
 
 - (NSTextField*)newLabelWithFrame:(NSRect)frame {
-  NSTextField* label = [[NSTextField alloc] initWithFrame:frame];
-  [label setDrawsBackground:NO];
-  [label setBezeled:NO];
-  [label setEditable:NO];
-  [label setSelectable:NO];
-  [label setAutoresizingMask:NSViewMinYMargin];
+  NSColor* color = gfx::SkColorToCalibratedNSColor(
+      message_center::kMessageCenterBackgroundColor);
+  MCTextField* label =
+      [[MCTextField alloc] initWithFrame:frame backgroundColor:color];
+
   return label;
 }
 
 - (void)updateView {
   notifiers_.clear();
   [trayViewController_ updateSettings];
 }
 
 - (void)loadView {
   DCHECK(notifiers_.empty());
@@ skipping 11 matching lines @@
       message_center::kMessageCenterBackgroundColor)];
   [view setTitlePosition:NSNoTitle];
   [self setView:view];
 
   // "Settings" text.
   NSRect headerFrame = NSMakeRect(kHorizontalMargin,
                                   kHorizontalMargin,
                                   NSWidth(fullFrame),
                                   NSHeight(fullFrame));
   settingsText_.reset([self newLabelWithFrame:headerFrame]);
-  [settingsText_ setAutoresizingMask:NSViewMinYMargin];
   [settingsText_ setTextColor:
           gfx::SkColorToCalibratedNSColor(message_center::kRegularTextColor)];
   [settingsText_
       setFont:[NSFont messageFontOfSize:message_center::kTitleFontSize]];
 
   [settingsText_ setStringValue:
           l10n_util::GetNSString(IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL)];
   [settingsText_ sizeToFit];
   headerFrame = [settingsText_ frame];
   headerFrame.origin.y = NSMaxY(fullFrame) - kCorrectedHeaderTextTopPadding -
                          NSHeight(headerFrame);
   [[self view] addSubview:settingsText_];
 
   // Subheader.
   NSRect subheaderFrame = NSMakeRect(kHorizontalMargin,
                                      kHorizontalMargin,
                                      NSWidth(fullFrame),
                                      NSHeight(fullFrame));
   detailsText_.reset([self newLabelWithFrame:subheaderFrame]);
-  [detailsText_ setAutoresizingMask:NSViewMinYMargin];
   [detailsText_ setTextColor:
       gfx::SkColorToCalibratedNSColor(message_center::kDimTextColor)];
   [detailsText_
       setFont:[NSFont messageFontOfSize:message_center::kMessageFontSize]];
 
   size_t groupCount = provider_->GetNotifierGroupCount();
   [detailsText_ setStringValue:l10n_util::GetNSString(
       groupCount > 1 ? IDS_MESSAGE_CENTER_SETTINGS_DESCRIPTION_MULTIUSER
                      : IDS_MESSAGE_CENTER_SETTINGS_DIALOG_DESCRIPTION)];
   [detailsText_ sizeToFit];
   subheaderFrame = [detailsText_ frame];
   subheaderFrame.origin.y =
       NSMinY(headerFrame) - kCorrectedSubheaderTextTopPadding -
       NSHeight(subheaderFrame);
   [[self view] addSubview:detailsText_];
 
   // Profile switcher is only needed for more than one profile.
   NSRect dropDownButtonFrame = subheaderFrame;
   if (groupCount > 1) {
     dropDownButtonFrame = NSMakeRect(kCorrectedDropDownMargin,
                                      kHorizontalMargin,
                                      NSWidth(fullFrame),
                                      NSHeight(fullFrame));
     groupDropDownButton_.reset(
-        [[NSPopUpButton alloc] initWithFrame:dropDownButtonFrame
-                                   pullsDown:YES]);
+        [[MCDropDown alloc] initWithFrame:dropDownButtonFrame pullsDown:YES]);
+    [groupDropDownButton_
+        setBackgroundColor:gfx::SkColorToCalibratedNSColor(
+                               message_center::kMessageCenterBackgroundColor)];
     [groupDropDownButton_ setAction:@selector(notifierGroupSelectionChanged:)];
     [groupDropDownButton_ setTarget:self];
     // Add a dummy item for pull-down.
     [groupDropDownButton_ addItemWithTitle:@""];
     base::string16 title;
     for (size_t i = 0; i < groupCount; ++i) {
       const message_center::NotifierGroup& group =
           provider_->GetNotifierGroupAt(i);
       base::string16 item =
           group.login_info.empty() ? group.name : group.login_info;
@@ skipping 130 matching lines @@
   NSPopUpButton* button = static_cast<NSPopUpButton*>(sender);
   // The first item is a dummy item.
   provider_->SwitchToNotifierGroup([button indexOfSelectedItem] - 1);
 }
 
 - (BOOL)notifierHasAdvancedSettings:(const message_center::NotifierId&)id {
   return provider_->NotifierHasAdvancedSettings(id);
 }
 
 @end