AutoFill Prefs dialog on Mac should list derived labels for profiles, not summaries.

chrome/browser/autofill/autofill_dialog_controller_mac.mm

 // Copyright (c) 2010 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/autofill/autofill_dialog_controller_mac.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/autofill/autofill_address_model_mac.h"
 #import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_model_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.h"
 #import "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/cocoa/window_size_autosaver.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
+namespace {
+
+// Update profile labels passed as |input|.  When profile data changes as a
+// result of adding new profiles, edititing existing profiles, or deleting a
+// profile, then the list of profiles need to have their derived labels
+// recomputed.
+void UpdateProfileLabels(std::vector<AutoFillProfile>* input) {
+  DCHECK(input);
+  std::vector<AutoFillProfile*> profiles;
+  profiles.resize(input->size());
+  for (size_t i = 0; i < input->size(); ++i) {
+    profiles[i] = &(*input)[i];
+  }
+  AutoFillProfile::AdjustInferredLabels(&profiles);
+}
+
+}  // namespace
+
 // Delegate protocol that needs to be in place for the AutoFillTableView's
 // handling of delete and backspace keys.
 @protocol DeleteKeyDelegate
 - (IBAction)deleteSelection:(id)sender;
 @end
 
 // A subclass of NSTableView that allows for deleting selected elements using
 // the delete or backspace keys.
 @interface AutoFillTableView : NSTableView {
 }
@@ skipping 259 matching lines @@
              contextInfo:(void*)contextInfo {
   DCHECK(contextInfo == NULL);
 
   if (returnCode) {
     // Create a new address and save it to the |profiles_| list.
     AutoFillProfile newAddress(string16(), 0);
     [addressSheetController copyModelToProfile:&newAddress];
     profiles_.push_back(newAddress);
 
     // Refresh the view based on new data.
+    UpdateProfileLabels(&profiles_);
     [tableView_ reloadData];
 
     // Update the selection to the newly added item.
     NSInteger row = [self rowFromProfileIndex:profiles_.size() - 1];
     [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
             byExtendingSelection:NO];
   }
   [sheet orderOut:self];
   addressSheetController.reset(nil);
 }
@@ skipping 33 matching lines @@
     if ([self tableView:tableView_ shouldSelectRow:selectedRow-1]) {
       [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow-1]
               byExtendingSelection:NO];
     } else if ([self tableView:tableView_ shouldSelectRow:selectedRow]) {
       [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow]
               byExtendingSelection:NO];
     } else {
       [tableView_ selectRowIndexes:[NSIndexSet indexSet]
               byExtendingSelection:NO];
     }
+    UpdateProfileLabels(&profiles_);
     [tableView_ reloadData];
   } else if ([self isCreditCardRow:selectedRow]) {
     creditCards_.erase(
         creditCards_.begin() + [self creditCardIndexFromRow:selectedRow]);
 
     // Select the previous row if possible, else current row, else deselect all.
     if ([self tableView:tableView_ shouldSelectRow:selectedRow-1]) {
       [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow-1]
               byExtendingSelection:NO];
     } else if ([self tableView:tableView_ shouldSelectRow:selectedRow]) {
@@ skipping 59 matching lines @@
 }
 
 // Edit address sheet was dismissed.  Non-zero |returnCode| indicates a save.
 - (void)addressEditDidEnd:(NSWindow *)sheet
                returnCode:(int)returnCode
               contextInfo:(void *)contextInfo {
   DCHECK(contextInfo != NULL);
   if (returnCode) {
     AutoFillProfile* profile = static_cast<AutoFillProfile*>(contextInfo);
     [addressSheetController copyModelToProfile:profile];
+    UpdateProfileLabels(&profiles_);
     [tableView_ reloadData];
   }
   [sheet orderOut:self];
   addressSheetController.reset(nil);
 }
 
 // Edit credit card sheet was dismissed.  Non-zero |returnCode| indicates a
 // save.
 - (void)creditCardEditDidEnd:(NSWindow *)sheet
                   returnCode:(int)returnCode
@@ skipping 39 matching lines @@
       return @"";
   }
 
   if (row < 0)
     return @"";
 
   // Data row.
   if ([self isProfileRow:row]) {
     if ([[tableColumn identifier] isEqualToString:@"Summary"]) {
       return SysUTF16ToNSString(
-          profiles_[[self profileIndexFromRow:row]].PreviewSummary());
+          profiles_[[self profileIndexFromRow:row]].Label());
     }
 
     return @"";
   }
 
   // Section label.
   if ([self isCreditCardGroupRow:row]) {
     if ([[tableColumn identifier] isEqualToString:@"Summary"])
       return l10n_util::GetNSString(IDS_AUTOFILL_CREDITCARDS_GROUP_NAME);
     else
@@ skipping 159 matching lines @@
     // Make local copy of |profiles|.
     for (std::vector<AutoFillProfile*>::const_iterator iter = profiles.begin();
          iter != profiles.end(); ++iter)
       profiles_.push_back(**iter);
 
     // Make local copy of |creditCards|.
     for (std::vector<CreditCard*>::const_iterator iter = creditCards.begin();
          iter != creditCards.end(); ++iter)
       creditCards_.push_back(**iter);
   }
+
+  UpdateProfileLabels(&profiles_);
 }
 
 - (BOOL)isProfileRow:(NSInteger)row {
   if (row > 0 && static_cast<size_t>(row) <= profiles_.size())
     return YES;
   return NO;
 }
 
 - (BOOL)isProfileGroupRow:(NSInteger)row {
   if (row == 0)
@@ skipping 79 matching lines @@
   if (!image) {
     image = rb.GetNSImageNamed(IDR_INPUT_GOOD);
     DCHECK(image);
     return image;
   }
 
   return nil;
 }
 
 @end