Never allow empty preview entries. As some data is always present (we drop co...

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/singleton.h"
 #include "base/sys_string_conversions.h"
@@ skipping 14 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
 // Type for singleton object that contains the instance of the visible
 // dialog.
 typedef std::map<Profile*, AutoFillDialogController*> ProfileControllerMap;
 
-// 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.
@@ skipping 773 matching lines @@
   for (std::vector<AutoFillProfile*>::const_iterator iter = profiles.begin();
        iter != profiles.end(); ++iter)
     profiles_.push_back(**iter);
 
   // Make local copy of |creditCards|.
   creditCards_.clear();
   for (std::vector<CreditCard*>::const_iterator iter = creditCards.begin();
        iter != creditCards.end(); ++iter)
     creditCards_.push_back(**iter);
 
-  UpdateProfileLabels(&profiles_);
   [tableView_ reloadData];
 }
 
 - (void)preferenceDidChange:(const std::string&)preferenceName {
   if (preferenceName == prefs::kAutoFillEnabled) {
     [self setAutoFillEnabled:autoFillEnabled_.GetValue()];
     [self setAutoFillManaged:autoFillEnabled_.IsManaged()];
     [self setAutoFillManagedAndDisabled:
         autoFillEnabled_.IsManaged() && !autoFillEnabled_.GetValue()];
   } else if (preferenceName == prefs::kAutoFillAuxiliaryProfilesEnabled) {
@@ skipping 93 matching lines @@
   if (!image) {
     image = rb.GetNativeImageNamed(IDR_INPUT_GOOD);
     DCHECK(image);
     return image;
   }
 
   return nil;
 }
 
 @end