re-commit r181807:

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright (c) 2012 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/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/string_split.h"
@@ skipping 203 matching lines @@
                kShippingInputs,
                arraysize(kShippingInputs),
                &requested_shipping_fields_);
 
   GenerateSuggestionsModels();
 
   // TODO(estade): don't show the dialog if the site didn't specify the right
   // fields. First we must figure out what the "right" fields are.
   view_.reset(AutofillDialogView::Create(this));
   view_->Show();
+  GetManager()->AddObserver(this);
 
   // Request sugar info after the view is showing to simplify code for now.
   if (CanPayWithWallet())
     ScheduleRefreshWalletItems();
 }
 
 void AutofillDialogControllerImpl::Hide() {
   if (view_)
     view_->Hide();
 }
 
+void AutofillDialogControllerImpl::UpdateProgressBar(double value) {
+  view_->UpdateProgressBar(value);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AutofillDialogController implementation.
 
 string16 AutofillDialogControllerImpl::DialogTitle() const {
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_TITLE);
 }
 
 string16 AutofillDialogControllerImpl::EditSuggestionText() const {
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_EDIT);
 }
@@ skipping 128 matching lines @@
   SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
   std::string item_key = model->GetItemKeyAt(model->checked_item());
   if (item_key.empty())
     return string16();
 
   if (section == SECTION_EMAIL)
     return model->GetLabelAt(model->checked_item());
 
   if (section == SECTION_CC) {
     CreditCard* card = GetManager()->GetCreditCardByGUID(item_key);
-    if (!card)
-      return string16();
-
     return card->TypeAndLastFourDigits();
   }
 
+  const std::string app_locale = AutofillCountry::ApplicationLocale();
   AutofillProfile* profile = GetManager()->GetProfileByGUID(item_key);
-  if (!profile)
-    return string16();
-
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   string16 comma = ASCIIToUTF16(", ");
   string16 label = profile->GetInfo(NAME_FULL, app_locale) +
       comma + profile->GetInfo(ADDRESS_HOME_LINE1, app_locale);
   string16 address2 = profile->GetInfo(ADDRESS_HOME_LINE2, app_locale);
   if (!address2.empty())
     label += comma + address2;
   label += ASCIIToUTF16("\n") +
       profile->GetInfo(ADDRESS_HOME_CITY, app_locale) + comma +
       profile->GetInfo(ADDRESS_HOME_STATE, app_locale) + ASCIIToUTF16(" ") +
       profile->GetInfo(ADDRESS_HOME_ZIP, app_locale);
   return label;
 }
 
 gfx::Image AutofillDialogControllerImpl::SuggestionIconForSection(
     DialogSection section) {
   if (section != SECTION_CC)
     return gfx::Image();
 
   std::string item_key =
       suggested_cc_.GetItemKeyAt(suggested_cc_.checked_item());
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   CreditCard* card = GetManager()->GetCreditCardByGUID(item_key);
-  if (!card)
-    return gfx::Image();
-
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetImageNamed(card->IconResourceId());
 }
 
 void AutofillDialogControllerImpl::EditClickedForSection(
     DialogSection section) {
   SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
 
   if (section == SECTION_EMAIL) {
     // TODO(estade): shouldn't need to make this check.
     if (inputs->empty())
       return;
 
     (*inputs)[0].autofilled_value = model->GetLabelAt(model->checked_item());
   } else {
     std::string guid = model->GetItemKeyAt(model->checked_item());
     DCHECK(!guid.empty());
 
     FormGroup* form_group = section == SECTION_CC ?
         static_cast<FormGroup*>(GetManager()->GetCreditCardByGUID(guid)) :
         static_cast<FormGroup*>(GetManager()->GetProfileByGUID(guid));
-
-    // TODO(estade): we shouldn't let this happen.
-    if (!form_group)
-      return;
-
+    DCHECK(form_group);
     FillInputFromFormGroup(form_group, inputs);
   }
 
   section_editing_state_[section] = true;
   view_->UpdateSection(section);
 }
 
 bool AutofillDialogControllerImpl::InputIsValid(AutofillFieldType type,
                                                 const string16& value) {
   switch (type) {
@@ skipping 93 matching lines @@
                           popup_icons,
                           popup_ids);
   section_showing_popup_ = section;
 }
 
 void AutofillDialogControllerImpl::FocusMoved() {
   HidePopup();
 }
 
 void AutofillDialogControllerImpl::ViewClosed(DialogAction action) {
+  GetManager()->RemoveObserver(this);
+
   if (action == ACTION_SUBMIT) {
     FillOutputForSection(SECTION_EMAIL);
     FillOutputForSection(SECTION_CC);
     FillOutputForSection(SECTION_BILLING);
     if (view_->UseBillingForShipping()) {
       FillOutputForSectionWithComparator(
           SECTION_BILLING,
           base::Bind(DetailInputMatchesShippingField));
       FillOutputForSectionWithComparator(
           SECTION_CC,
           base::Bind(DetailInputMatchesShippingField));
     } else {
       FillOutputForSection(SECTION_SHIPPING);
     }
     callback_.Run(&form_structure_);
   } else {
     callback_.Run(NULL);
   }
 
   delete this;
 }
 
-void AutofillDialogControllerImpl::UpdateProgressBar(double value) {
-  view_->UpdateProgressBar(value);
-}
-
 DialogNotification AutofillDialogControllerImpl::CurrentNotification() const {
   if (HasRequiredAction(wallet::VERIFY_CVV)) {
     return DialogNotification(
         DialogNotification::REQUIRED_ACTION,
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_VERIFY_CVV));
   }
 
   if (RequestingCreditCardInfo() && !TransmissionWillBeSecure()) {
     return DialogNotification(
         DialogNotification::SECURITY_WARNING,
@@ skipping 34 matching lines @@
 
 Profile* AutofillDialogControllerImpl::profile() {
   return profile_;
 }
 
 content::WebContents* AutofillDialogControllerImpl::web_contents() {
   return contents_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// AutofillPopupDelegate
+// AutofillPopupDelegate implementation.
 
 void AutofillDialogControllerImpl::OnPopupShown(
     content::KeyboardListener* listener) {}
 
 void AutofillDialogControllerImpl::OnPopupHidden(
     content::KeyboardListener* listener) {}
 
 void AutofillDialogControllerImpl::DidSelectSuggestion(int identifier) {
   // TODO(estade): implement.
 }
 
 void AutofillDialogControllerImpl::DidAcceptSuggestion(const string16& value,
                                                        int identifier) {
   const PersonalDataManager::GUIDPair& pair = popup_guids_[identifier];
 
   FormGroup* form_group = section_showing_popup_ == SECTION_CC ?
       static_cast<FormGroup*>(GetManager()->GetCreditCardByGUID(pair.first)) :
       // TODO(estade): need to use the variant, |pair.second|.
       static_cast<FormGroup*>(GetManager()->GetProfileByGUID(pair.first));
-
-  // TODO(estade): we shouldn't let this happen.
-  if (!form_group)
-    return;
+  DCHECK(form_group);
 
   FillInputFromFormGroup(
       form_group,
       MutableRequestedFieldsForSection(section_showing_popup_));
   view_->UpdateSection(section_showing_popup_);
 
   // TODO(estade): not sure why it's necessary to do this explicitly.
   HidePopup();
 }
 
 void AutofillDialogControllerImpl::RemoveSuggestion(const string16& value,
                                                     int identifier) {
   // TODO(estade): implement.
 }
 
 void AutofillDialogControllerImpl::ClearPreviewedForm() {
   // TODO(estade): implement.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// content::NotificationObserver
+// content::NotificationObserver implementation.
 
 void AutofillDialogControllerImpl::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, content::NOTIFICATION_NAV_ENTRY_COMMITTED);
   content::LoadCommittedDetails* load_details =
       content::Details<content::LoadCommittedDetails>(details).ptr();
   if (wallet::IsSignInContinueUrl(load_details->entry->GetVirtualURL())) {
     EndSignInFlow();
     if (CanPayWithWallet())
       ScheduleRefreshWalletItems();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// SuggestionsMenuModelDelegate
+// SuggestionsMenuModelDelegate implementation.
 
 void AutofillDialogControllerImpl::SuggestionItemSelected(
     const SuggestionsMenuModel& model) {
   DialogSection section = SectionForSuggestionsMenuModel(model);
   section_editing_state_[section] = false;
   view_->UpdateSection(section);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// wallet::WalletClientObserver
+// wallet::WalletClientObserver implementation.
 
 void AutofillDialogControllerImpl::OnDidAcceptLegalDocuments() {
   NOTIMPLEMENTED();
 }
 
 void AutofillDialogControllerImpl::OnDidEncryptOtp(
     const std::string& encrypted_otp, const std::string& session_material) {
   NOTIMPLEMENTED() << " encrypted_otp=" << encrypted_otp
                    << ", session_material=" << session_material;
 }
@@ skipping 56 matching lines @@
 
 void AutofillDialogControllerImpl::OnMalformedResponse() {
   WalletRequestCompleted(false);
 }
 
 void AutofillDialogControllerImpl::OnNetworkError(int response_code) {
   WalletRequestCompleted(false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// PersonalDataManagerObserver implementation.
+
+void AutofillDialogControllerImpl::OnPersonalDataChanged() {
+  HidePopup();
+  GenerateSuggestionsModels();
+  view_->ModelChanged();
+}
+
+////////////////////////////////////////////////////////////////////////////////
 
 bool AutofillDialogControllerImpl::HandleKeyPressEventInInput(
     const content::NativeWebKeyboardEvent& event) {
   if (popup_controller_)
     return popup_controller_->HandleKeyPressEvent(event);
 
   return false;
 }
 
 bool AutofillDialogControllerImpl::RequestingCreditCardInfo() const {
@@ skipping 44 matching lines @@
     view_->UpdateAccountChooser();
     view_->UpdateNotificationArea();
     return;
   }
 
   if (refresh_wallet_items_queued_)
     ScheduleRefreshWalletItems();
 }
 
 void AutofillDialogControllerImpl::GenerateSuggestionsModels() {
+  suggested_cc_.Reset();
+  suggested_billing_.Reset();
+  suggested_email_.Reset();
+  suggested_shipping_.Reset();
+
   PersonalDataManager* manager = GetManager();
   const std::vector<CreditCard*>& cards = manager->credit_cards();
   for (size_t i = 0; i < cards.size(); ++i) {
     suggested_cc_.AddKeyedItem(cards[i]->guid(), cards[i]->Label());
   }
   // TODO(estade): real strings and i18n.
   suggested_cc_.AddKeyedItem("", ASCIIToUTF16("Enter new card"));
 
   const std::vector<AutofillProfile*>& profiles = manager->GetProfiles();
   const std::string app_locale = AutofillCountry::ApplicationLocale();
@@ skipping 37 matching lines @@
 void AutofillDialogControllerImpl::FillOutputForSectionWithComparator(
     DialogSection section,
     const InputFieldComparator& compare) {
   SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
   std::string guid = model->GetItemKeyAt(model->checked_item());
   PersonalDataManager* manager = GetManager();
   if (!guid.empty() && !section_editing_state_[section]) {
     FormGroup* form_group = section == SECTION_CC ?
         static_cast<FormGroup*>(manager->GetCreditCardByGUID(guid)) :
         static_cast<FormGroup*>(manager->GetProfileByGUID(guid));
-    // TODO(estade): we shouldn't let this happen.
-    if (!form_group)
-      return;
+    DCHECK(form_group);
 
     // Calculate the variant by looking at how many items come from the same
     // FormGroup. TODO(estade): add a test for this.
     size_t variant = 0;
     for (int i = model->checked_item() - 1; i >= 0; --i) {
       if (model->GetItemKeyAt(i) == guid)
         variant++;
       else
         break;
     }
@@ skipping 111 matching lines @@
     DialogSection section) {
   return const_cast<DetailInputs*>(&RequestedFieldsForSection(section));
 }
 
 void AutofillDialogControllerImpl::HidePopup() {
   if (popup_controller_)
     popup_controller_->Hide();
 }
 
 }  // namespace autofill