UI changes to Autofill dialogs according to the latest mocks...

chrome/browser/views/autofill_profiles_view_win.cc

 // 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.
 #include "chrome/browser/views/autofill_profiles_view_win.h"
 
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/list_background.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/canvas.h"
 #include "gfx/native_theme_win.h"
 #include "gfx/size.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
@@ skipping 26 matching lines @@
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView, static data:
 AutoFillProfilesView* AutoFillProfilesView::instance_ = NULL;
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView, public:
 AutoFillProfilesView::AutoFillProfilesView(
     AutoFillDialogObserver* observer,
     PersonalDataManager* personal_data_manager,
+    Profile* profile,
     PrefService* preferences,
     AutoFillProfile* imported_profile,
     CreditCard* imported_credit_card)
     : observer_(observer),
       personal_data_manager_(personal_data_manager),
+      profile_(profile),
       preferences_(preferences),
+      enable_auto_fill_button_(NULL),
       add_address_button_(NULL),
       add_credit_card_button_(NULL),
       edit_button_(NULL),
       remove_button_(NULL),
       scroll_view_(NULL),
       focus_manager_(NULL),
       billing_model_(true),
       child_dialog_opened_(false) {
   DCHECK(preferences_);
   if (imported_profile) {
@@ skipping 12 matching lines @@
 
   // Removes observer if we are observing Profile load. Does nothing otherwise.
   if (personal_data_manager_)
     personal_data_manager_->RemoveObserver(this);
 }
 
 // TODO: get rid of imported_profile and imported_credit_card.
 int AutoFillProfilesView::Show(gfx::NativeWindow parent,
                                AutoFillDialogObserver* observer,
                                PersonalDataManager* personal_data_manager,
+                               Profile* profile,
                                PrefService* preferences,
                                AutoFillProfile* imported_profile,
                                CreditCard* imported_credit_card) {
   if (!instance_) {
     instance_ = new AutoFillProfilesView(observer, personal_data_manager,
-        preferences, imported_profile, imported_credit_card);
+        profile, preferences, imported_profile, imported_credit_card);
 
     // |instance_| will get deleted once Close() is called.
     views::Window::CreateChromeWindow(parent, gfx::Rect(), instance_);
   }
   if (!instance_->window()->IsVisible())
     instance_->window()->Show();
   else
     instance_->window()->Activate();
   return 0;
 }
@@ skipping 60 matching lines @@
   UpdateButtonState();
 }
 
 void AutoFillProfilesView::UpdateButtonState() {
   DCHECK(personal_data_manager_);
   DCHECK(scroll_view_);
   DCHECK(add_address_button_);
   DCHECK(add_credit_card_button_);
   DCHECK(edit_button_);
   DCHECK(remove_button_);
+  bool autofill_enabled = preferences_->GetBoolean(prefs::kAutoFillEnabled);
+  scroll_view_->SetEnabled(autofill_enabled);
   add_address_button_->SetEnabled(personal_data_manager_->IsDataLoaded() &&
-                                  !child_dialog_opened_);
+                                  !child_dialog_opened_ && autofill_enabled);
   add_credit_card_button_->SetEnabled(personal_data_manager_->IsDataLoaded() &&
-                                      !child_dialog_opened_);
+                                      !child_dialog_opened_ &&
+                                      autofill_enabled);
 
   int selected_row_count = scroll_view_->SelectedRowCount();
-  edit_button_->SetEnabled(selected_row_count == 1 && !child_dialog_opened_);
-  remove_button_->SetEnabled(selected_row_count > 0 && !child_dialog_opened_);
+  edit_button_->SetEnabled(selected_row_count == 1 && !child_dialog_opened_ &&
+                           autofill_enabled);
+  remove_button_->SetEnabled(selected_row_count > 0 && !child_dialog_opened_ &&
+                             autofill_enabled);
+}
+
+void AutoFillProfilesView::UpdateProfileLabels() {
+  std::vector<AutoFillProfile*> profiles;
+  profiles.resize(profiles_set_.size());
+  for (size_t i = 0; i < profiles_set_.size(); ++i) {
+    profiles[i] = &(profiles_set_[i].address);
+  }
+  AutoFillProfile::AdjustInferredLabels(&profiles);
 }
 
 void AutoFillProfilesView::ChildWindowOpened() {
   child_dialog_opened_ = true;
   UpdateButtonState();
 }
 
 void AutoFillProfilesView::ChildWindowClosed() {
   child_dialog_opened_ = false;
   UpdateButtonState();
@@ skipping 119 matching lines @@
 void AutoFillProfilesView::ButtonPressed(views::Button* sender,
                                          const views::Event& event) {
   if (sender == add_address_button_) {
     AddClicked(ContentListTableModel::kAddressGroup);
   } else if (sender == add_credit_card_button_) {
     AddClicked(ContentListTableModel::kCreditCardGroup);
   } else if (sender == edit_button_) {
     EditClicked();
   } else if (sender == remove_button_) {
     DeleteClicked();
+  } else if (sender == enable_auto_fill_button_) {
+    bool enabled = enable_auto_fill_button_->checked();
+    UserMetricsAction action(enabled ? "Options_FormAutofill_Enable" :
+                                       "Options_FormAutofill_Disable");
+    UserMetrics::RecordAction(action, profile_);
+    preferences_->SetBoolean(prefs::kAutoFillEnabled, enabled);
+    preferences_->ScheduleSavePersistentPrefs();
+    UpdateButtonState();
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView, views::LinkController implementations:
 void AutoFillProfilesView::LinkActivated(views::Link* source, int event_flags) {
   Browser* browser = BrowserList::GetLastActive();
   browser->OpenURL(GURL(kAutoFillLearnMoreUrl), GURL(), NEW_FOREGROUND_TAB,
                    PageTransition::TYPED);
 }
@@ skipping 26 matching lines @@
 void  AutoFillProfilesView::OnPersonalDataLoaded() {
   personal_data_manager_->RemoveObserver(this);
   GetData();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView, private:
 void AutoFillProfilesView::Init() {
   GetData();
 
+  enable_auto_fill_button_ = new views::Checkbox(
+      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_ENABLE));
+  enable_auto_fill_button_->set_listener(this);
+  enable_auto_fill_button_->SetChecked(
+      preferences_->GetBoolean(prefs::kAutoFillEnabled));
+
   billing_model_.set_address_labels(&profiles_set_);
 
   table_model_.reset(new ContentListTableModel(&profiles_set_,
                                                &credit_card_set_));
   std::vector<TableColumn> columns;
-  columns.resize(2);
-  columns[0] = TableColumn(IDS_AUTOFILL_LIST_HEADER_LABEL,
-                           TableColumn::LEFT, -1, .33f);
-  columns.back().sortable = false;
-  columns[1] = TableColumn(IDS_AUTOFILL_LIST_HEADER_SUMMARY,
+  columns.resize(1);
+  columns[0] = TableColumn(IDS_AUTOFILL_LIST_HEADER_SUMMARY,
                            TableColumn::LEFT, -1, .67f);
   columns.back().sortable = false;
 
   scroll_view_ = new views::TableView(table_model_.get(), columns,
                                       views::TEXT_ONLY, false, true, true);
   scroll_view_->SetObserver(this);
 
   add_address_button_ = new views::NativeButton(this,
       l10n_util::GetString(IDS_AUTOFILL_ADD_ADDRESS_BUTTON));
   add_credit_card_button_ = new views::NativeButton(this,
       l10n_util::GetString(IDS_AUTOFILL_ADD_CREDITCARD_BUTTON));
   edit_button_ = new views::NativeButton(this,
       l10n_util::GetString(IDS_AUTOFILL_EDIT_BUTTON));
   remove_button_ = new views::NativeButton(this,
       l10n_util::GetString(IDS_AUTOFILL_DELETE_BUTTON));
 
   views::GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
 
   const int table_with_buttons_column_view_set_id = 0;
   views::ColumnSet* column_set =
       layout->AddColumnSet(table_with_buttons_column_view_set_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 0,
                         views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, table_with_buttons_column_view_set_id);
+  layout->AddView(enable_auto_fill_button_, 3, 1, views::GridLayout::FILL,
+                  views::GridLayout::FILL);
+  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+
+  layout->StartRow(0, table_with_buttons_column_view_set_id);
   layout->AddView(scroll_view_, 1, 8, views::GridLayout::FILL,
                   views::GridLayout::FILL);
   layout->AddView(add_address_button_);
 
   layout->StartRowWithPadding(0, table_with_buttons_column_view_set_id, 0,
                               kRelatedControlVerticalSpacing);
   layout->SkipColumns(2);
   layout->AddView(add_credit_card_button_);
 
   layout->StartRowWithPadding(0, table_with_buttons_column_view_set_id, 0,
@@ skipping 25 matching lines @@
                                !credit_card_set_.empty();
   if (!imported_data_present) {
     profiles_set_.reserve(personal_data_manager_->profiles().size());
     for (std::vector<AutoFillProfile*>::const_iterator address_it =
          personal_data_manager_->profiles().begin();
          address_it != personal_data_manager_->profiles().end();
          ++address_it) {
       profiles_set_.push_back(EditableSetInfo(*address_it));
     }
   }
+  UpdateProfileLabels();
 
   if (!imported_data_present) {
     credit_card_set_.reserve(personal_data_manager_->credit_cards().size());
     for (std::vector<CreditCard*>::const_iterator cc_it =
          personal_data_manager_->credit_cards().begin();
          cc_it != personal_data_manager_->credit_cards().end();
          ++cc_it) {
       credit_card_set_.push_back(EditableSetInfo(*cc_it));
     }
   }
@@ skipping 90 matching lines @@
                                              views::ImageButton::ALIGN_MIDDLE);
     layout->AddView(phone_warning_button_);
     UpdateButtons();
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents, static data:
 AutoFillProfilesView::EditableSetViewContents::TextFieldToAutoFill
     AutoFillProfilesView::EditableSetViewContents::address_fields_[] = {
-  { AutoFillProfilesView::EditableSetViewContents::TEXT_LABEL, NO_SERVER_DATA },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_FULL_NAME,
     NAME_FULL },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_COMPANY, COMPANY_NAME },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_EMAIL, EMAIL_ADDRESS },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_ADDRESS_LINE_1,
     ADDRESS_HOME_LINE1 },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_ADDRESS_LINE_2,
     ADDRESS_HOME_LINE2 },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_ADDRESS_CITY,
     ADDRESS_HOME_CITY },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_ADDRESS_STATE,
     ADDRESS_HOME_STATE },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_ADDRESS_ZIP,
     ADDRESS_HOME_ZIP },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_ADDRESS_COUNTRY,
     ADDRESS_HOME_COUNTRY },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_PHONE_PHONE,
     PHONE_HOME_NUMBER },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_FAX_PHONE,
     PHONE_FAX_NUMBER },
 };
 
 AutoFillProfilesView::EditableSetViewContents::TextFieldToAutoFill
     AutoFillProfilesView::EditableSetViewContents::credit_card_fields_[] = {
-  { AutoFillProfilesView::EditableSetViewContents::TEXT_LABEL, NO_SERVER_DATA },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_CC_NAME,
     CREDIT_CARD_NAME },
   { AutoFillProfilesView::EditableSetViewContents::TEXT_CC_NUMBER,
     CREDIT_CARD_NUMBER },
 };
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents, public:
 AutoFillProfilesView::EditableSetViewContents::EditableSetViewContents(
     AutoFillProfilesView* observer,
     AddressComboBoxModel* billing_model,
     bool new_item,
     std::vector<EditableSetInfo>::iterator field_set)
     : editable_fields_set_(field_set),
       temporary_info_(*editable_fields_set_),
-      label_warning_button_(NULL),
       observer_(observer),
       billing_model_(billing_model),
       combo_box_billing_(NULL),
       new_item_(new_item) {
   ZeroMemory(text_fields_, sizeof(text_fields_));
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents, protected:
 /////////////////////////////////////////////////////////////////////////////
@@ skipping 16 matching lines @@
 
 void AutoFillProfilesView::EditableSetViewContents::ViewHierarchyChanged(
     bool is_add, views::View* parent, views::View* child) {
   if (is_add && this == child) {
     observer_->ChildWindowOpened();
     views::GridLayout* layout = new views::GridLayout(this);
     layout->SetInsets(kSubViewVerticalInsets, kSubViewHorizotalInsets,
                       kSubViewVerticalInsets, kSubViewHorizotalInsets);
     SetLayoutManager(layout);
     InitLayoutGrid(layout);
-    InitTitle(layout);
     if (temporary_info_.is_address)
       InitAddressFields(layout);
     else
       InitCreditCardFields(layout);
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents,
 // views::DialogDelegate implementations
@@ skipping 20 matching lines @@
 bool AutoFillProfilesView::EditableSetViewContents::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   switch (button) {
   case MessageBoxFlags::DIALOGBUTTON_OK: {
     bool phones_are_valid = true;
     for (std::vector<PhoneSubView*>::const_iterator it =
              phone_sub_views_.begin();
          it != phone_sub_views_.end() && phones_are_valid; ++it)
       phones_are_valid = (phones_are_valid && (*it)->IsValid());
 
-    return phones_are_valid && LabelValid();
+    return phones_are_valid;
   }
   case MessageBoxFlags::DIALOGBUTTON_CANCEL:
     return true;
   default:
     break;
   }
   NOTREACHED();
   return false;
 }
 
@@ skipping 37 matching lines @@
   if (temporary_info_.is_address) {
     index = editable_fields_set_ - observer_->profiles_set_.begin();
   } else {
     index = editable_fields_set_ - observer_->credit_card_set_.begin();
     index += observer_->profiles_set_.size();
   }
   if (new_item_)
     observer_->table_model_->AddItem(index);
   else
     observer_->table_model_->UpdateItem(index);
+  if (temporary_info_.is_address)
+    observer_->UpdateProfileLabels();
   return true;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents,
 // views::ButtonListener implementations
 void AutoFillProfilesView::EditableSetViewContents::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   NOTREACHED();
 }
 
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents,
 // views::Textfield::Controller implementations
 void AutoFillProfilesView::EditableSetViewContents::ContentsChanged(
     views::Textfield* sender,  const string16& new_contents) {
   if (temporary_info_.is_address) {
     for (int field = 0; field < arraysize(address_fields_); ++field) {
       DCHECK(text_fields_[address_fields_[field].text_field]);
       if (text_fields_[address_fields_[field].text_field] == sender) {
-        if (address_fields_[field].text_field == TEXT_LABEL) {
-          temporary_info_.address.set_label(new_contents);
-          // One of the address labels changed - update combo boxes
-          billing_model_->LabelChanged();
-        } else {
-          UpdateContentsPhoneViews(address_fields_[field].text_field,
-                                   sender, new_contents);
-          temporary_info_.address.SetInfo(
-              AutoFillType(address_fields_[field].type), new_contents);
-        }
+        UpdateContentsPhoneViews(address_fields_[field].text_field,
+                                 sender, new_contents);
+        temporary_info_.address.SetInfo(
+            AutoFillType(address_fields_[field].type), new_contents);
         UpdateButtons();
         return;
       }
     }
   } else {
     for (int field = 0; field < arraysize(credit_card_fields_); ++field) {
       DCHECK(text_fields_[credit_card_fields_[field].text_field]);
       if (text_fields_[credit_card_fields_[field].text_field] == sender) {
-        if (credit_card_fields_[field].text_field == TEXT_LABEL) {
-          temporary_info_.credit_card.set_label(new_contents);
-        } else {
-          UpdateContentsPhoneViews(address_fields_[field].text_field,
-                                   sender, new_contents);
-          temporary_info_.credit_card.SetInfo(
-              AutoFillType(credit_card_fields_[field].type), new_contents);
-        }
+        UpdateContentsPhoneViews(address_fields_[field].text_field,
+                                 sender, new_contents);
+        temporary_info_.credit_card.SetInfo(
+            AutoFillType(credit_card_fields_[field].type), new_contents);
         UpdateButtons();
         return;
       }
     }
   }
 }
 
 bool AutoFillProfilesView::EditableSetViewContents::HandleKeystroke(
     views::Textfield* sender, const views::Textfield::Keystroke& keystroke) {
   if (sender == text_fields_[TEXT_CC_NUMBER] &&
       !temporary_info_.has_credit_card_number_been_edited) {
     // You cannot edit obfuscated number, you must retype it anew.
     sender->SetText(string16());
     temporary_info_.has_credit_card_number_been_edited = true;
   }
   return false;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents,
 // views::Combobox::Listener implementations:
 void AutoFillProfilesView::EditableSetViewContents::ItemChanged(
     views::Combobox* combo_box, int prev_index, int new_index) {
   DCHECK(billing_model_);
   if (combo_box == combo_box_billing_) {
     if (new_index == -1) {
       NOTREACHED();
     } else {
+      DCHECK(new_index < static_cast<int>(observer_->profiles_set_.size()));
       temporary_info_.credit_card.set_billing_address(
-          billing_model_->GetItemAt(new_index));
+          IntToString16(
+          observer_->profiles_set_[new_index].address.unique_id()));
     }
   } else if (combo_box == combo_box_month_) {
     if (new_index == -1) {
       NOTREACHED();
     } else {
       temporary_info_.credit_card.SetInfo(
           AutoFillType(CREDIT_CARD_EXP_MONTH),
           combo_box_model_month_->GetItemAt(new_index));
     }
   } else if (combo_box == combo_box_year_) {
     if (new_index == -1) {
       NOTREACHED();
     } else {
       temporary_info_.credit_card.SetInfo(
           AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
           combo_box_model_year_->GetItemAt(new_index));
     }
   } else {
     NOTREACHED();
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents, private:
-void AutoFillProfilesView::EditableSetViewContents::InitTitle(
-    views::GridLayout* layout) {
-  std::wstring title;
-  if (temporary_info_.is_address) {
-    title = temporary_info_.address.Label();
-    if (title.empty())
-      title = l10n_util::GetString(IDS_AUTOFILL_NEW_ADDRESS);
-  } else {
-    title = temporary_info_.credit_card.Label();
-    if (title.empty())
-      title = l10n_util::GetString(IDS_AUTOFILL_NEW_CREDITCARD);
-  }
-  label_warning_button_ = new views::ImageButton(this);
-  label_warning_button_->SetEnabled(false);
-  label_warning_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
-                                           views::ImageButton::ALIGN_MIDDLE);
-  text_fields_[TEXT_LABEL] =
-      new views::Textfield(views::Textfield::STYLE_DEFAULT);
-  text_fields_[TEXT_LABEL]->SetText(temporary_info_.is_address ?
-      temporary_info_.address.Label() : temporary_info_.credit_card.Label());
-  text_fields_[TEXT_LABEL]->SetController(this);
-
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
-  layout->StartRow(0, triple_column_leading_view_set_id_);
-  layout->AddView(new views::Label(
-    l10n_util::GetString(IDS_AUTOFILL_DIALOG_LABEL)));
-
-  layout->StartRow(0, triple_column_fill_view_set_id_);
-  layout->AddView(text_fields_[TEXT_LABEL]);
-  layout->AddView(label_warning_button_);
-}
-
 void AutoFillProfilesView::EditableSetViewContents::InitAddressFields(
     views::GridLayout* layout) {
   DCHECK(temporary_info_.is_address);
 
   for (int field = 0; field < arraysize(address_fields_); ++field) {
-    if (address_fields_[field].text_field == TEXT_LABEL)
-      continue;
     DCHECK(!text_fields_[address_fields_[field].text_field]);
     text_fields_[address_fields_[field].text_field] =
         new views::Textfield(views::Textfield::STYLE_DEFAULT);
     text_fields_[address_fields_[field].text_field]->SetController(this);
     text_fields_[address_fields_[field].text_field]->SetText(
         temporary_info_.address.GetFieldText(
         AutoFillType(address_fields_[field].type)));
   }
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
@@ skipping 94 matching lines @@
   model_strings.clear();
   model_strings.reserve(20);
   base::Time::Exploded exploded_time;
   base::Time::Now().LocalExplode(&exploded_time);
   for (int year = 0; year < 10; ++year)
     model_strings.push_back(StringPrintf(L"%04i", year + exploded_time.year));
   combo_box_model_year_.reset(new StringVectorComboboxModel);
   combo_box_model_year_->set_cb_strings(&model_strings);
 
   for (int field = 0; field < arraysize(credit_card_fields_); ++field) {
-    if (credit_card_fields_[field].text_field == TEXT_LABEL)
-      continue;
     DCHECK(!text_fields_[credit_card_fields_[field].text_field]);
     text_fields_[credit_card_fields_[field].text_field] =
         new views::Textfield(views::Textfield::STYLE_DEFAULT);
     text_fields_[credit_card_fields_[field].text_field]->SetController(this);
     string16 field_text;
     if (credit_card_fields_[field].text_field == TEXT_CC_NUMBER) {
       field_text = temporary_info_.credit_card.GetFieldText(
           AutoFillType(credit_card_fields_[field].type));
       if (!field_text.empty())
         field_text = temporary_info_.credit_card.ObfuscatedNumber();
     } else {
       field_text = temporary_info_.credit_card.GetFieldText(
           AutoFillType(credit_card_fields_[field].type));
     }
     text_fields_[credit_card_fields_[field].text_field]->SetText(field_text);
   }
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_NAME_ON_CARD));
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_CC_NAME]);
 
   // Address combo boxes.
   combo_box_billing_ = new views::Combobox(billing_model_);
   combo_box_billing_->set_listener(this);
-  combo_box_billing_->SetSelectedItem(
-      billing_model_->GetIndex(
-      temporary_info_.credit_card.billing_address()));
+  int billing_id = -1;
+  if (StringToInt(temporary_info_.credit_card.billing_address(), &billing_id))
+    combo_box_billing_->SetSelectedItem(billing_model_->GetIndex(billing_id));
   billing_model_->UsedWithComboBox(combo_box_billing_);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_BILLING_ADDRESS));
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(combo_box_billing_);
 
   // Layout credit card info
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
@@ skipping 112 matching lines @@
 }
 
 views::Label*
 AutoFillProfilesView::EditableSetViewContents::CreateLeftAlignedLabel(
     int label_id) {
   views::Label* label = new views::Label(l10n_util::GetString(label_id));
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   return label;
 }
 
-bool AutoFillProfilesView::EditableSetViewContents::LabelValid() const {
-  if (temporary_info_.is_address)
-    return !temporary_info_.address.Label().empty();
-  else
-    return !temporary_info_.credit_card.Label().empty();
-}
-
 void AutoFillProfilesView::EditableSetViewContents::UpdateButtons() {
-  SkBitmap* image = observer_->GetWarningBimap(LabelValid());
-  if (LabelValid()) {
-    label_warning_button_->SetTooltipText(std::wstring());
-  } else {
-    label_warning_button_->SetTooltipText(l10n_util::GetString(
-        IDS_AUTOFILL_BAD_LABEL_TOOLTIP));
-  }
-  label_warning_button_->SetImage(views::CustomButton::BS_NORMAL, image);
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 void AutoFillProfilesView::EditableSetViewContents::UpdateContentsPhoneViews(
     TextFields field, views::Textfield* sender, const string16& new_contents) {
   switch (field) {
     case TEXT_PHONE_PHONE:
     case TEXT_FAX_PHONE: {
       for (std::vector<PhoneSubView*>::iterator it = phone_sub_views_.begin();
            it != phone_sub_views_.end(); ++it)
@@ skipping 23 matching lines @@
 }
 
 void AutoFillProfilesView::AddressComboBoxModel::LabelChanged() {
   DCHECK(address_labels_);
   for (std::list<views::Combobox*>::iterator it = combo_boxes_.begin();
        it != combo_boxes_.end();
        ++it)
     (*it)->ModelChanged();
 }
 
-int AutoFillProfilesView::AddressComboBoxModel::GetIndex(const string16 &s) {
+int AutoFillProfilesView::AddressComboBoxModel::GetIndex(int unique_id) {
   int shift = is_billing_ ? 0 : 1;
   DCHECK(address_labels_);
   for (size_t i = 0; i < address_labels_->size(); ++i) {
     DCHECK(address_labels_->at(i).is_address);
-    if (address_labels_->at(i).address.Label() == s)
+    if (address_labels_->at(i).address.unique_id() == unique_id)
       return i + shift;
   }
   return -1;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::AddressComboBoxModel,  ComboboxModel methods
 int AutoFillProfilesView::AddressComboBoxModel::GetItemCount() {
   DCHECK(address_labels_);
   int shift = is_billing_ ? 0 : 1;
   return static_cast<int>(address_labels_->size()) + shift;
 }
 
 std::wstring AutoFillProfilesView::AddressComboBoxModel::GetItemAt(int index) {
   DCHECK(address_labels_);
   int shift = is_billing_ ? 0 : 1;
   DCHECK(index < (static_cast<int>(address_labels_->size()) + shift));
   if (!is_billing_ && !index)
     return l10n_util::GetString(IDS_AUTOFILL_DIALOG_SAME_AS_BILLING);
   DCHECK(address_labels_->at(index - shift).is_address);
-  std::wstring label = address_labels_->at(index - shift).address.Label();
+  std::wstring label =
+      address_labels_->at(index - shift).address.Label();
   if (label.empty())
     label = l10n_util::GetString(IDS_AUTOFILL_NEW_ADDRESS);
   return label;
 }
 
 void AutoFillProfilesView::StringVectorComboboxModel::set_cb_strings(
     std::vector<std::wstring> *source) {
   cb_strings_.swap(*source);
 }
 
@@ skipping 49 matching lines @@
 }
 
 int AutoFillProfilesView::ContentListTableModel::RowCount() {
   return profiles_->size() + credit_cards_->size();
 }
 
 std::wstring AutoFillProfilesView::ContentListTableModel::GetText(
     int row, int column_id) {
   DCHECK(row < static_cast<int>(profiles_->size() + credit_cards_->size()));
   if (row < static_cast<int>(profiles_->size())) {
-    if (column_id == IDS_AUTOFILL_LIST_HEADER_LABEL) {
-      return profiles_->at(row).address.Label();
-    } else {
-      return profiles_->at(row).address.PreviewSummary();
-    }
+    return profiles_->at(row).address.PreviewSummary();
   } else {
     row -= profiles_->size();
-    if (column_id == IDS_AUTOFILL_LIST_HEADER_LABEL) {
-      return credit_cards_->at(row).credit_card.Label();
-    } else {
-      return credit_cards_->at(row).credit_card.PreviewSummary();
-    }
+    return credit_cards_->at(row).credit_card.PreviewSummary();
   }
 }
 
 TableModel::Groups AutoFillProfilesView::ContentListTableModel::GetGroups() {
   TableModel::Groups groups;
 
   TableModel::Group profile_group;
   profile_group.title = l10n_util::GetString(IDS_AUTOFILL_ADDRESSES_GROUP_NAME);
   profile_group.id = kAddressGroup;
   groups.push_back(profile_group);
@@ skipping 20 matching lines @@
 
 // Declared in "chrome/browser/autofill/autofill_dialog.h"
 void ShowAutoFillDialog(gfx::NativeView parent,
                         AutoFillDialogObserver* observer,
                         Profile* profile) {
   DCHECK(profile);
 
   PersonalDataManager* personal_data_manager =
       profile->GetPersonalDataManager();
   DCHECK(personal_data_manager);
-  AutoFillProfilesView::Show(parent, observer, personal_data_manager,
+  AutoFillProfilesView::Show(parent, observer, personal_data_manager, profile,
                              profile->GetPrefs(), NULL, NULL);
 }