Rename AutofillDialogController to AutofillDialogViewDelegate.

chrome/browser/ui/cocoa/autofill/autofill_section_container.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 "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 
 #include <algorithm>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_pop_up_button.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_view.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_suggestion_container.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h"
 #import "chrome/browser/ui/cocoa/autofill/layout_view.h"
 #include "chrome/browser/ui/cocoa/autofill/simple_grid_layout.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "grit/theme_resources.h"
@@ skipping 21 matching lines @@
 
 // Padding between section label and section input.
 const int kPadding = 30;
 
 // Fixed width for the details section.
 const int kDetailsWidth = 300;
 
 // Top/bottom inset for contents of a detail section.
 const size_t kDetailSectionInset = 10;
 
-// Break suggestion text into two lines. TODO(groby): Should be on controller.
+// Break suggestion text into two lines. TODO(groby): Should be on delegate.
 void BreakSuggestionText(const string16& text,
                          string16* line1,
                          string16* line2) {
   // TODO(estade): does this localize well?
   string16 line_return(base::ASCIIToUTF16("\n"));
   size_t position = text.find(line_return);
   if (position == string16::npos) {
     *line1 = text;
     line2->clear();
   } else {
     *line1 = text.substr(0, position);
     *line2 = text.substr(position + line_return.length());
   }
 }
 
 // If the Autofill data comes from a credit card, make sure to overwrite the
 // CC comboboxes (even if they already have something in them). If the
 // Autofill data comes from an AutofillProfile, leave the comboboxes alone.
-// TODO(groby): This kind of logic should _really_ live on the controller.
+// TODO(groby): This kind of logic should _really_ live on the delegate.
 bool ShouldOverwriteComboboxes(autofill::DialogSection section,
                                autofill::AutofillFieldType type) {
   if (autofill::AutofillType(type).group() != autofill::CREDIT_CARD) {
     return false;
   }
 
   if (section == autofill::SECTION_CC) {
     return true;
   }
 
   return section == autofill::SECTION_CC_BILLING;
 }
 
 bool CompareInputRows(const autofill::DetailInput* input1,
                       const autofill::DetailInput* input2) {
   // Row ID -1 is sorted to the end of rows.
   if (input2->row_id == -1)
     return false;
   return input2->row_id < input1->row_id;
 }
 
 }
 
 @interface AutofillSectionContainer ()
 
-// A text field has been edited or activated - inform the controller that it's
+// A text field has been edited or activated - inform the delegate that it's
 // time to show a suggestion popup & possibly reset the validity of the input.
 - (void)textfieldEditedOrActivated:(NSControl<AutofillInputField>*)field
                             edited:(BOOL)edited;
 
 // Convenience method to retrieve a field type via the control's tag.
 - (autofill::AutofillFieldType)fieldTypeForControl:(NSControl*)control;
 
 // Find the DetailInput* associated with a field type.
 - (const autofill::DetailInput*)detailInputForType:
     (autofill::AutofillFieldType)type;
 
 // Takes an NSArray of controls and builds a DetailOutputMap from them.
-// Translates between Cocoa code and controller, essentially.
+// Translates between Cocoa code and delegate, essentially.
 // All controls must inherit from NSControl and conform to AutofillInputView.
 - (void)fillDetailOutputs:(autofill::DetailOutputMap*)outputs
              fromControls:(NSArray*)controls;
 
-// Updates input fields based on controller status. If |shouldClobber| is YES,
+// Updates input fields based on delegate status. If |shouldClobber| is YES,
 // will clobber existing data and reset fields to the initial values.
 - (void)updateAndClobber:(BOOL)shouldClobber;
 
 // Create properly styled label for section. Autoreleased.
 - (NSTextField*)makeDetailSectionLabel:(NSString*)labelText;
 
 // Create a button offering input suggestions.
 - (MenuButton*)makeSuggestionButton;
 
-// Create a view with all inputs requested by |controller_|. Autoreleased.
+// Create a view with all inputs requested by |delegate_|. Autoreleased.
 - (LayoutView*)makeInputControls;
 
 @end
 
 @implementation AutofillSectionContainer
 
 @synthesize section = section_;
 @synthesize validationDelegate = validationDelegate_;
 
-- (id)initWithController:(autofill::AutofillDialogController*)controller
+- (id)initWithDelegate:(autofill::AutofillDialogViewDelegate*)delegate
               forSection:(autofill::DialogSection)section {
   if (self = [super init]) {
     section_ = section;
-    controller_ = controller;
+    delegate_ = delegate;
   }
   return self;
 }
 
 - (void)getInputs:(autofill::DetailOutputMap*)output {
   [self fillDetailOutputs:output fromControls:[inputs_ subviews]];
 }
 
 // Note: This corresponds to Views' "UpdateDetailsGroupState".
 - (void)modelChanged {
-  ui::MenuModel* suggestionModel = controller_->MenuModelForSection(section_);
+  ui::MenuModel* suggestionModel = delegate_->MenuModelForSection(section_);
   menuController_.reset([[MenuController alloc] initWithModel:suggestionModel
                                        useWithPopUpButtonCell:YES]);
   NSMenu* menu = [menuController_ menu];
 
   const BOOL hasSuggestions = [menu numberOfItems] > 0;
   [suggestButton_ setHidden:!hasSuggestions];
 
   [suggestButton_ setAttachedMenu:menu];
 
   [self updateSuggestionState];
 
   // TODO(groby): "Save in Chrome" handling.
 
   if (![[self view] isHidden])
     [self validateFor:autofill::VALIDATE_EDIT];
 
   // Always request re-layout on state change.
-  id controller = [[view_ window] windowController];
-  if ([controller respondsToSelector:@selector(requestRelayout)])
-    [controller performSelector:@selector(requestRelayout)];
+  id delegate = [[view_ window] windowController];
+  if ([delegate respondsToSelector:@selector(requestRelayout)])
+    [delegate performSelector:@selector(requestRelayout)];
 }
 
 - (void)loadView {
   // Keep a list of weak pointers to DetailInputs.
   const autofill::DetailInputs& inputs =
-      controller_->RequestedFieldsForSection(section_);
+      delegate_->RequestedFieldsForSection(section_);
   for (size_t i = 0; i < inputs.size(); ++i) {
     detailInputs_.push_back(&(inputs[i]));
   }
 
   inputs_.reset([[self makeInputControls] retain]);
-  string16 labelText = controller_->LabelForSection(section_);
+  string16 labelText = delegate_->LabelForSection(section_);
   label_.reset([[self makeDetailSectionLabel:
                    base::SysUTF16ToNSString(labelText)] retain]);
 
   suggestButton_.reset([[self makeSuggestionButton] retain]);
   suggestContainer_.reset([[AutofillSuggestionContainer alloc] init]);
 
   view_.reset([[AutofillSectionView alloc] initWithFrame:NSZeroRect]);
   [self setView:view_];
   [[self view] setSubviews:
       @[label_, inputs_, [suggestContainer_ view], suggestButton_]];
@@ skipping 80 matching lines @@
 - (void)didChange:(id)sender {
   [self textfieldEditedOrActivated:sender edited:YES];
 }
 
 - (void)didEndEditing:(id)sender {
   [self validateFor:autofill::VALIDATE_EDIT];
 }
 
 - (void)updateSuggestionState {
   const autofill::SuggestionState& suggestionState =
-      controller_->SuggestionStateForSection(section_);
+      delegate_->SuggestionStateForSection(section_);
   bool showSuggestions = !suggestionState.text.empty();
 
   [[suggestContainer_ view] setHidden:!showSuggestions];
   [inputs_ setHidden:showSuggestions];
 
   string16 line1;
   string16 line2;
   BreakSuggestionText(suggestionState.text, &line1, &line2);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::Font font = rb.GetFont(ui::ResourceBundle::BaseFont).DeriveFont(
       0, suggestionState.text_style);
   [suggestContainer_ setSuggestionText:base::SysUTF16ToNSString(line1)
                                  line2:base::SysUTF16ToNSString(line2)
                               withFont:font.GetNativeFont()];
   [suggestContainer_ setIcon:suggestionState.icon.AsNSImage()];
   if (!suggestionState.extra_text.empty()) {
     NSString* extraText =
         base::SysUTF16ToNSString(suggestionState.extra_text);
     NSImage* extraIcon = suggestionState.extra_icon.AsNSImage();
     [suggestContainer_ showInputField:extraText withIcon:extraIcon];
   }
   [view_ setShouldHighlightOnHover:showSuggestions];
-  [view_ setHidden:!controller_->SectionIsActive(section_)];
+  [view_ setHidden:!delegate_->SectionIsActive(section_)];
 }
 
 - (void)update {
   [self updateAndClobber:YES];
 }
 
 - (void)fillForInput:(const autofill::DetailInput&)input {
   // Make sure to overwrite the originating input if it is a text field.
   AutofillTextField* field =
       base::mac::ObjCCast<AutofillTextField>([inputs_ viewWithTag:input.type]);
   [field setFieldValue:@""];
 
   if (ShouldOverwriteComboboxes(section_, input.type)) {
     for (NSControl* control in [inputs_ subviews]) {
       AutofillPopUpButton* popup =
           base::mac::ObjCCast<AutofillPopUpButton>(control);
       if (popup) {
         autofill::AutofillFieldType fieldType =
             [self fieldTypeForControl:popup];
         if (autofill::AutofillType(fieldType).group() ==
                 autofill::CREDIT_CARD) {
           ui::ComboboxModel* model =
-              controller_->ComboboxModelForAutofillType(fieldType);
+              delegate_->ComboboxModelForAutofillType(fieldType);
           DCHECK(model);
           [popup selectItemAtIndex:model->GetDefaultIndex()];
         }
       }
     }
   }
 
   [self updateAndClobber:NO];
 }
 
 - (void)editLinkClicked {
-  controller_->EditClickedForSection(section_);
+  delegate_->EditClickedForSection(section_);
 }
 
 - (NSString*)editLinkTitle {
-  return base::SysUTF16ToNSString(controller_->EditSuggestionText());
+  return base::SysUTF16ToNSString(delegate_->EditSuggestionText());
 }
 
 - (BOOL)validateFor:(autofill::ValidationType)validationType {
   DCHECK(![[self view] isHidden]);
 
   NSArray* fields = nil;
   if (![inputs_ isHidden]) {
     fields = [inputs_ subviews];
   } else if (section_ == autofill::SECTION_CC) {
     fields = @[[suggestContainer_ inputField]];
   }
 
   autofill::DetailOutputMap detailOutputs;
   [self fillDetailOutputs:&detailOutputs fromControls:fields];
-  autofill::ValidityData invalidInputs = controller_->InputsAreValid(
+  autofill::ValidityData invalidInputs = delegate_->InputsAreValid(
       section_, detailOutputs, validationType);
 
   for (NSControl<AutofillInputField>* input in fields) {
     const autofill::AutofillFieldType type = [self fieldTypeForControl:input];
     if (invalidInputs.count(type))
       [input setValidityMessage:base::SysUTF16ToNSString(invalidInputs[type])];
     else
       [input setValidityMessage:@""];
     [validationDelegate_ updateMessageForField:input];
   }
@@ skipping 19 matching lines @@
   NSRect textFrameInScreen = [field convertRect:[field frame] toView:nil];
   textFrameInScreen.origin =
       [[field window] convertBaseToScreen:textFrameInScreen.origin];
 
   // And adjust for gfx::Rect being flipped compared to OSX coordinates.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   textFrameInScreen.origin.y =
       NSMaxY([screen frame]) - NSMaxY(textFrameInScreen);
   gfx::Rect textFrameRect(NSRectToCGRect(textFrameInScreen));
 
-  controller_->UserEditedOrActivatedInput(section_,
+  delegate_->UserEditedOrActivatedInput(section_,
                                           [self detailInputForType:type],
                                           [self view],
                                           textFrameRect,
                                           fieldValue,
                                           edited);
 
   // If the field is marked as invalid, check if the text is now valid.
   // Many fields (i.e. CC#) are invalid for most of the duration of editing,
   // so flagging them as invalid prematurely is not helpful. However,
   // correcting a minor mistake (i.e. a wrong CC digit) should immediately
   // result in validation - positive user feedback.
   if ([textfield invalid]) {
-    string16 message = controller_->InputValidityMessage(section_,
+    string16 message = delegate_->InputValidityMessage(section_,
                                                          type,
                                                          fieldValue);
     [textfield setValidityMessage:base::SysUTF16ToNSString(message)];
     [validationDelegate_ updateMessageForField:textfield];
 
     // If the field transitioned from invalid to valid, re-validate the group,
     // since inter-field checks become meaningful with valid fields.
     if (![textfield invalid])
       [self validateFor:autofill::VALIDATE_EDIT];
   }
 
   // Update the icon for the textfield.
-  gfx::Image icon = controller_->IconForField(type, fieldValue);
+  gfx::Image icon = delegate_->IconForField(type, fieldValue);
   if (!icon.IsEmpty()) {
     [[textfield cell] setIcon:icon.ToNSImage()];
   }
 }
 
 - (autofill::AutofillFieldType)fieldTypeForControl:(NSControl*)control {
   DCHECK([control tag]);
   return static_cast<autofill::AutofillFieldType>([control tag]);
 }
 
@@ skipping 28 matching lines @@
                                          toHaveTrait:NSBoldFontMask]];
   [label setStringValue:labelText];
   [label setEditable:NO];
   [label setBordered:NO];
   [label sizeToFit];
   return label.autorelease();
 }
 
 - (void)updateAndClobber:(BOOL)shouldClobber {
   const autofill::DetailInputs& updatedInputs =
-      controller_->RequestedFieldsForSection(section_);
+      delegate_->RequestedFieldsForSection(section_);
 
   for (autofill::DetailInputs::const_iterator iter = updatedInputs.begin();
        iter != updatedInputs.end();
        ++iter) {
     NSControl<AutofillInputField>* field = [inputs_ viewWithTag:iter->type];
     DCHECK(field);
 
     [field setEnabled:iter->editable];
 
     // TODO(groby): For comboboxes, "empty" means "set to default index"
     if (shouldClobber || [[field fieldValue] length] == 0) {
       [field setFieldValue:base::SysUTF16ToNSString(iter->initial_value)];
       AutofillTextField* textField =
           base::mac::ObjCCast<AutofillTextField>(field);
       if (textField) {
         gfx::Image icon =
-            controller_->IconForField(iter->type, iter->initial_value);
+            delegate_->IconForField(iter->type, iter->initial_value);
         if (!icon.IsEmpty()) {
           [[textField cell] setIcon:icon.ToNSImage()];
         }
       }
     }
   }
   [self modelChanged];
 }
 
 - (MenuButton*)makeSuggestionButton {
@@ skipping 52 matching lines @@
       // Add a new column to existing row.
       column_set->AddPaddingColumn(kRelatedControlHorizontalSpacing);
       // Must explicitly skip the padding column since we've already started
       // adding views.
       layout->SkipColumns(1);
     }
 
     column_set->AddColumn(input.expand_weight ? input.expand_weight : 1.0f);
 
     ui::ComboboxModel* input_model =
-        controller_->ComboboxModelForAutofillType(input.type);
+        delegate_->ComboboxModelForAutofillType(input.type);
     base::scoped_nsprotocol<NSControl<AutofillInputField>*> control;
     if (input_model) {
       base::scoped_nsobject<AutofillPopUpButton> popup(
           [[AutofillPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO]);
       for (int i = 0; i < input_model->GetItemCount(); ++i) {
         [popup addItemWithTitle:
             base::SysUTF16ToNSString(input_model->GetItemAt(i))];
       }
       control.reset(popup.release());
     } else {
       base::scoped_nsobject<AutofillTextField> field(
           [[AutofillTextField alloc] init]);
       [[field cell] setPlaceholderString:
           l10n_util::GetNSStringWithFixup(input.placeholder_text_rid)];
       [[field cell] setIcon:
-          controller_->IconForField(
+          delegate_->IconForField(
               input.type, input.initial_value).AsNSImage()];
       control.reset(field.release());
     }
     [control setFieldValue:base::SysUTF16ToNSString(input.initial_value)];
     [control sizeToFit];
     [control setTag:input.type];
     [control setDelegate:self];
     // Hide away fields that cannot be edited.
     if (kColumnSetId == -1) {
       [control setFrame:NSZeroRect];
@@ skipping 29 matching lines @@
 
 - (void)activateFieldForInput:(const autofill::DetailInput&)input {
   if ([self detailInputForType:input.type] != &input)
     return;
 
   NSControl<AutofillInputField>* field = [inputs_ viewWithTag:input.type];
   [[field window] makeFirstResponder:field];
 }
 
 @end