Merge 53276 - AutoFill Empty profiles should not be saved from AutoFillDialog...

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"
@@ skipping 300 matching lines @@
 // Add address sheet was dismissed.  Non-zero |returnCode| indicates a save.
 - (void)addressAddDidEnd:(NSWindow*)sheet
               returnCode:(int)returnCode
              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);
+    if (!newAddress.IsEmpty()) {
+      profiles_.push_back(newAddress);
 
-    // Refresh the view based on new data.
-    UpdateProfileLabels(&profiles_);
-    [tableView_ reloadData];
+      // 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];
+      // 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);
 }
 
 // Add credit card sheet was dismissed.  Non-zero |returnCode| indicates a save.
 - (void)creditCardAddDidEnd:(NSWindow *)sheet
                  returnCode:(int)returnCode
                 contextInfo:(void *)contextInfo {
   DCHECK(contextInfo == NULL);
 
   if (returnCode) {
     // Create a new credit card and save it to the |creditCards_| list.
     CreditCard newCreditCard(string16(), 0);
     [creditCardSheetController copyModelToCreditCard:&newCreditCard];
-    creditCards_.push_back(newCreditCard);
+    if (!newCreditCard.IsEmpty()) {
+      creditCards_.push_back(newCreditCard);
 
-    // Refresh the view based on new data.
-    [tableView_ reloadData];
+      // Refresh the view based on new data.
+      [tableView_ reloadData];
 
-    // Update the selection to the newly added item.
-    NSInteger row = [self rowFromCreditCardIndex:creditCards_.size() - 1];
-    [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
-            byExtendingSelection:NO];
+      // Update the selection to the newly added item.
+      NSInteger row = [self rowFromCreditCardIndex:creditCards_.size() - 1];
+      [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
+              byExtendingSelection:NO];
+    }
   }
   [sheet orderOut:self];
   creditCardSheetController.reset(nil);
 }
 
 // Deletes selected items; either addresses, credit cards, or a mixture of the
 // two depending on the items selected.
 - (IBAction)deleteSelection:(id)sender {
   NSIndexSet* selection = [tableView_ selectedRowIndexes];
   NSInteger selectedRow = [tableView_ selectedRow];
@@ skipping 82 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];
+
+    if (profile->IsEmpty())
+      [tableView_ deselectAll:self];
+    profiles_.erase(
+        std::remove_if(profiles_.begin(), profiles_.end(),
+                       std::mem_fun_ref(&AutoFillProfile::IsEmpty)),
+        profiles_.end());
+
     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
                  contextInfo:(void *)contextInfo {
   DCHECK(contextInfo != NULL);
   if (returnCode) {
     CreditCard* creditCard = static_cast<CreditCard*>(contextInfo);
     [creditCardSheetController copyModelToCreditCard:creditCard];
+
+    if (creditCard->IsEmpty())
+      [tableView_ deselectAll:self];
+    creditCards_.erase(
+        std::remove_if(
+            creditCards_.begin(), creditCards_.end(),
+            std::mem_fun_ref(&CreditCard::IsEmpty)),
+        creditCards_.end());
     [tableView_ reloadData];
   }
   [sheet orderOut:self];
   creditCardSheetController.reset(nil);
 }
 
 // NSTableView Delegate method.
 - (BOOL)tableView:(NSTableView *)tableView isGroupRow:(NSInteger)row {
   if ([self isProfileGroupRow:row] || [self isCreditCardGroupRow:row])
     return YES;
@@ skipping 325 matching lines @@
   if (!image) {
     image = rb.GetNSImageNamed(IDR_INPUT_GOOD);
     DCHECK(image);
     return image;
   }
 
   return nil;
 }
 
 @end