Autofill OSX: Replace AutofillPopUpButton with NSPopUpButton.

chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm

 // Copyright (c) 2015 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.
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
 #include "chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.h"
-#import "chrome/browser/ui/cocoa/autofill/autofill_pop_up_button.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #include "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 60 matching lines @@
 void CardUnmaskPromptViewBridge::PerformClose() {
   constrained_window_->CloseWebContentsModalDialog();
 }
 
 }  // autofill
 
 #pragma mark CardUnmaskPromptViewCocoa
 
 @implementation CardUnmaskPromptViewCocoa
 
-+ (AutofillPopUpButton*)buildDatePopupWithModel:(ui::ComboboxModel&)model {
-  AutofillPopUpButton* popup =
-      [[AutofillPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO];
++ (NSPopUpButton*)buildDatePopupWithModel:(ui::ComboboxModel&)model {
+  NSPopUpButton* popup =
+      [[NSPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO];
 
   for (int i = 0; i < model.GetItemCount(); ++i) {
     [popup addItemWithTitle:base::SysUTF16ToNSString(model.GetItemAt(i))];
   }
-  [popup setDefaultValue:base::SysUTF16ToNSString(
-                             model.GetItemAt(model.GetDefaultIndex()))];

[bondd, 2015/03/05 23:51:06]

defaultValue is not currently used so it's safe to remove this.

   [popup sizeToFit];
   return popup;
 }
 
 // Set |view|'s frame to the minimum dimensions required to contain all of its
 // subviews.
 + (void)sizeToFitView:(NSView*)view {
   NSRect frame = NSZeroRect;
   for (NSView* child in [view subviews]) {
     frame = NSUnionRect(frame, [child frame]);
@@ skipping 63 matching lines @@
   [instructions setAttributedStringValue:instructionsString];
   [mainView addSubview:instructions];
 
   // Expiration date.
   base::scoped_nsobject<NSView> expirationView;
   if (controller->ShouldRequestExpirationDate()) {
     expirationView.reset([[NSView alloc] initWithFrame:NSZeroRect]);
 
     // Month.
     autofill::MonthComboboxModel monthModel;
-    base::scoped_nsobject<AutofillPopUpButton> monthPopup(
+    base::scoped_nsobject<NSPopUpButton> monthPopup(
         [CardUnmaskPromptViewCocoa buildDatePopupWithModel:monthModel]);
     [expirationView addSubview:monthPopup];
 
     // Year.
     autofill::YearComboboxModel yearModel;
-    base::scoped_nsobject<AutofillPopUpButton> yearPopup(
+    base::scoped_nsobject<NSPopUpButton> yearPopup(
         [CardUnmaskPromptViewCocoa buildDatePopupWithModel:yearModel]);
     [expirationView addSubview:yearPopup];
 
     // Layout month and year within expirationView.
     [yearPopup
         setFrameOrigin:NSMakePoint(NSMaxX([monthPopup frame]) + kButtonGap, 0)];
     NSRect expirationFrame = NSUnionRect([monthPopup frame], [yearPopup frame]);
     expirationFrame.size.width += kButtonGap;
     [expirationView setFrame:expirationFrame];
     [inputRowView addSubview:expirationView];
@@ skipping 83 matching lines @@
   // Dialog size.
   [mainView
       setFrameSize:NSMakeSize(
                        contentWidth + [mainView contentViewMargins].width * 2.0,
                        NSMaxY([title frame]) + chrome_style::kTitleTopPadding)];
 
   [self setView:mainView];
 }
 
 @end