Revert 180111, it was not the cause, says isherman@.

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 252 matching lines @@
 string16 AutofillDialogControllerImpl::SignInText() const {
   // TODO(abodenha): real strings and l10n.
   return string16(ASCIIToUTF16("Sign in to use Google Wallet"));
 }
 
 string16 AutofillDialogControllerImpl::CancelSignInText() const {
   // TODO(abodenha): real strings and l10n.
   return string16(ASCIIToUTF16("Don't sign in."));
 }
 
+DialogSignedInState AutofillDialogControllerImpl::SignedInState() const {
+  if (!wallet_items_)
+    return REQUIRES_RESPONSE;
+
+  if (HasRequiredAction(wallet::GAIA_AUTH))
+    return REQUIRES_SIGN_IN;
+
+  if (HasRequiredAction(wallet::PASSIVE_GAIA_AUTH))
+    return REQUIRES_PASSIVE_SIGN_IN;
+
+  return SIGNED_IN;
+}
+
 string16 AutofillDialogControllerImpl::SaveLocallyText() const {
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX);
 }
 
 string16 AutofillDialogControllerImpl::ProgressBarText() const {
   return l10n_util::GetStringUTF16(
       IDS_AUTOFILL_DIALOG_AUTOCHECKOUT_PROGRESS_BAR);
 }
 
 const DetailInputs& AutofillDialogControllerImpl::RequestedFieldsForSection(
@@ skipping 232 matching lines @@
   }
 
   delete this;
 }
 
 void AutofillDialogControllerImpl::UpdateProgressBar(double value) {
   view_->UpdateProgressBar(value);
 }
 
 DialogNotification AutofillDialogControllerImpl::CurrentNotification() const {
-  if (wallet_items_ && !wallet_items_->required_actions().empty()) {
-    switch (wallet_items_->required_actions()[0]) {
-      case wallet::UNKNOWN_TYPE:
-        NOTREACHED();
-        break;
-      // TODO(dbeam): da real i18nz.
-      case wallet::SETUP_WALLET:
-        return DialogNotification(DialogNotification::REQUIRED_ACTION,
-                                  ASCIIToUTF16("Set up da walletz"));
-      case wallet::ACCEPT_TOS:
-        return DialogNotification(DialogNotification::REQUIRED_ACTION,
-                                  ASCIIToUTF16("Accept da ToS"));
-      case wallet::GAIA_AUTH:
-        return DialogNotification(DialogNotification::REQUIRED_ACTION,
-                                  ASCIIToUTF16("Sign in to da Googlez"));
-      case wallet::UPDATE_EXPIRATION_DATE:
-        return DialogNotification(DialogNotification::REQUIRED_ACTION,
-                                  ASCIIToUTF16("Update da expiration datez"));
-      case wallet::UPGRADE_MIN_ADDRESS:
-        return DialogNotification(DialogNotification::REQUIRED_ACTION,
-                                  ASCIIToUTF16("Upgrade da min addrezz"));
-      case wallet::INVALID_FORM_FIELD:
-        return DialogNotification(DialogNotification::REQUIRED_ACTION,
-                                  ASCIIToUTF16("Da form field is invalid"));
-      case wallet::VERIFY_CVV:
-        return DialogNotification(DialogNotification::REQUIRED_ACTION,
-                                  ASCIIToUTF16("Verify da CVVz"));
-      case wallet::PASSIVE_GAIA_AUTH:
-        return DialogNotification(DialogNotification::REQUIRED_ACTION,
-                                  ASCIIToUTF16("Passively sign in to Googlez"));
-    }
+  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,
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SECURITY_WARNING));
   }
 
   if (!invoked_from_same_origin_) {
     return DialogNotification(
@@ skipping 72 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // content::NotificationObserver
 
 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()))
+  if (wallet::IsSignInContinueUrl(load_details->entry->GetVirtualURL())) {
     EndSignInFlow();
+    // TODO(dbeam): the fetcher can't handle being called multiple times.
+    // Address this soon as we will be re-fetching wallet items after every
+    // required action is resolved.
+    wallet_client_.GetWalletItems(this);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SuggestionsMenuModelDelegate
 
 void AutofillDialogControllerImpl::SuggestionItemSelected(
     const SuggestionsMenuModel& model) {
   DialogSection section = SectionForSuggestionsMenuModel(model);
   section_editing_state_[section] = false;
   view_->UpdateSection(section);
@@ skipping 18 matching lines @@
 }
 
 void AutofillDialogControllerImpl::OnDidGetFullWallet(
     scoped_ptr<wallet::FullWallet> full_wallet) {
   NOTIMPLEMENTED();
 }
 
 void AutofillDialogControllerImpl::OnDidGetWalletItems(
     scoped_ptr<wallet::WalletItems> wallet_items) {
   wallet_items_ = wallet_items.Pass();
+  view_->UpdateAccountChooser();
   view_->UpdateNotificationArea();
 }
 
 void AutofillDialogControllerImpl::OnDidSaveAddress(
     const std::string& address_id) {
   NOTIMPLEMENTED() << " address_id=" << address_id;
 }
 
 void AutofillDialogControllerImpl::OnDidSaveInstrument(
     const std::string& instrument_id) {
@@ skipping 47 matching lines @@
 
   return false;
 }
 
 bool AutofillDialogControllerImpl::TransmissionWillBeSecure() const {
   return source_url_.SchemeIs(chrome::kHttpsScheme) &&
          !net::IsCertStatusError(ssl_status_.cert_status) &&
          !net::IsCertStatusMinorError(ssl_status_.cert_status);
 }
 
+bool AutofillDialogControllerImpl::HasRequiredAction(
+    wallet::RequiredAction action) const {
+  if (!wallet_items_)
+    return false;
+
+  const std::vector<wallet::RequiredAction>& actions =
+      wallet_items_->required_actions();
+  return std::find(actions.begin(), actions.end(), action) != actions.end();
+}
+
 void AutofillDialogControllerImpl::GenerateSuggestionsModels() {
   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();
@@ skipping 166 matching lines @@
 }
 
 void AutofillDialogControllerImpl::HidePopup() {
   if (popup_controller_) {
     popup_controller_->Hide();
     ControllerDestroyed();
   }
 }
 
 }  // namespace autofill