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

ui/message_center/cocoa/settings_controller.h

 // 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.
 
 #ifndef UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_
 #define UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
+#import "ui/message_center/cocoa/opaque_views.h"
 #import "ui/message_center/cocoa/settings_entry_view.h"
 #include "ui/message_center/message_center_export.h"
 #include "ui/message_center/notifier_settings.h"
 
 @class MCSettingsController;
 @class MCTrayViewController;
 
 namespace message_center {
 
 // Bridge class between C++ and Cocoa world.
@@ skipping 24 matching lines @@
   message_center::NotifierSettingsProvider* provider_;
   MCTrayViewController* trayViewController_;  // Weak. Owns us.
 
   // The "Settings" text at the top.
   base::scoped_nsobject<NSTextField> settingsText_;
 
   // The smaller text below the "Settings" text.
   base::scoped_nsobject<NSTextField> detailsText_;
 
   // The profile switcher.
-  base::scoped_nsobject<NSPopUpButton> groupDropDownButton_;
+  base::scoped_nsobject<MCDropDown> groupDropDownButton_;
 
   // Container for all the checkboxes.
   base::scoped_nsobject<NSScrollView> scrollView_;
 
   std::vector<message_center::Notifier*> notifiers_;
 }
 
 // Designated initializer.
 - (id)initWithProvider:(message_center::NotifierSettingsProvider*)provider
     trayViewController:(MCTrayViewController*)trayViewController;
@@ skipping 12 matching lines @@
 @end
 
 // Testing API /////////////////////////////////////////////////////////////////
 
 @interface MCSettingsController (TestingAPI)
 - (NSPopUpButton*)groupDropDownButton;
 - (NSScrollView*)scrollView;
 @end
 
 #endif  // UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_