Multi-account AccountChooser for interactive autocomplete.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright 2013 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 <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 446 matching lines @@
 
   return SIGNED_IN;
 }
 
 bool AutofillDialogControllerImpl::ShouldShowSpinner() const {
   return account_chooser_model_.WalletIsSelected() &&
          SignedInState() == REQUIRES_RESPONSE;
 }
 
 string16 AutofillDialogControllerImpl::AccountChooserText() const {
+  // TODO(aruslan): this should be l10n "Not using Google Wallet".
   if (!account_chooser_model_.WalletIsSelected())
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PAY_WITHOUT_WALLET);
 
   if (SignedInState() == SIGNED_IN)
-    return UTF8ToUTF16(current_username_);
+    return account_chooser_model_.active_wallet_account_name();
 
   // In this case, the account chooser should be showing the signin link.
   return string16();
 }
 
 string16 AutofillDialogControllerImpl::SignInLinkText() const {
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SIGN_IN);
 }
 
 bool AutofillDialogControllerImpl::ShouldOfferToSaveInChrome() const {
@@ skipping 44 matching lines @@
 
 bool AutofillDialogControllerImpl::IsSubmitPausedOn(
     wallet::RequiredAction required_action) const {
   return full_wallet_ && full_wallet_->HasRequiredAction(required_action);
 }
 
 void AutofillDialogControllerImpl::GetWalletItems() {
   GetWalletClient()->GetWalletItems(source_url_);
 }
 
-void AutofillDialogControllerImpl::OnWalletOrSigninUpdate() {
+void AutofillDialogControllerImpl::SignedInStateUpdated() {
+  if (!account_chooser_model_.WalletIsSelected())
+    return;
+
   switch (SignedInState()) {
     case SIGNED_IN:
       // Start fetching the user name if we don't know it yet.
-      if (current_username_.empty()) {
+      if (account_chooser_model_.active_wallet_account_name().empty()) {
         signin_helper_.reset(new wallet::WalletSigninHelper(
             this, profile_->GetRequestContext()));
         signin_helper_->StartUserNameFetch();
       }
       break;
 
     case REQUIRES_SIGN_IN:
-      // TODO(aruslan): automatic sign-in?
+      // Switch to the local account and refresh the dialog.
+      OnWalletSigninError();
       break;
 
     case REQUIRES_PASSIVE_SIGN_IN:
       // Attempt to passively sign in the user.
-      current_username_.clear();
+      DCHECK(!signin_helper_);
+      account_chooser_model_.ClearActiveWalletAccountName();
       signin_helper_.reset(new wallet::WalletSigninHelper(
-          this, profile_->GetRequestContext()));
+          this,
+          profile_->GetRequestContext()));
       signin_helper_->StartPassiveSignin();
       break;
 
     case REQUIRES_RESPONSE:
       break;
   }
+}
 
+void AutofillDialogControllerImpl::OnWalletOrSigninUpdate() {
+  SignedInStateUpdated();
   SuggestionsUpdated();
-  view_->UpdateAccountChooser();
-  view_->UpdateNotificationArea();
+  UpdateAccountChooserView();
 
   // On the first successful response, compute the initial user state metric.
   if (initial_user_state_ == AutofillMetrics::DIALOG_USER_STATE_UNKNOWN)
     initial_user_state_ = GetInitialUserState();
 }
 
 void AutofillDialogControllerImpl::OnWalletSigninError() {
   signin_helper_.reset();
-  current_username_.clear();
   account_chooser_model_.SetHadWalletSigninError();
   GetWalletClient()->CancelRequests();
 }
 
 void AutofillDialogControllerImpl::EnsureLegalDocumentsText() {
   if (!wallet_items_ || wallet_items_->legal_documents().empty())
     return;
 
   // The text has already been constructed, no need to recompute.
   if (!legal_documents_text_.empty())
@@ skipping 75 matching lines @@
       return NULL;
   }
 }
 
 ui::MenuModel* AutofillDialogControllerImpl::MenuModelForSection(
     DialogSection section) {
   return SuggestionsMenuModelForSection(section);
 }
 
 ui::MenuModel* AutofillDialogControllerImpl::MenuModelForAccountChooser() {
-  // When paying with wallet, but not signed in, there is no menu, just a
-  // sign in link.
-  if (account_chooser_model_.WalletIsSelected() && SignedInState() != SIGNED_IN)
-    return NULL;
+  // If there were unrecoverable Wallet errors, or if there are choices other
+  // than "Pay without the wallet", show the full menu.
+  if (account_chooser_model_.had_wallet_error() ||
+      account_chooser_model_.HasAccountsToChoose())

[Evan Stade, 2013/04/12 17:06:36]

curlies

[aruslan, 2013/04/12 20:43:30]

Done.

+    return &account_chooser_model_;
 
-  return &account_chooser_model_;
+  // Otherwise, there is no menu, just a sign in link.
+  return NULL;
 }
 
 gfx::Image AutofillDialogControllerImpl::AccountChooserImage() {
   if (!MenuModelForAccountChooser()) {
     return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         IDR_WALLET_ICON);
   }
 
   gfx::Image icon;
-  account_chooser_model_.GetIconAt(account_chooser_model_.checked_item(),
-                                   &icon);
+  account_chooser_model_.GetIconAt(
+      account_chooser_model_.GetIndexOfCommandId(
+          account_chooser_model_.checked_item()),
+      &icon);
   return icon;
 }
 
 string16 AutofillDialogControllerImpl::LabelForSection(DialogSection section)
     const {
   switch (section) {
     case SECTION_EMAIL:
       return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SECTION_EMAIL);
     case SECTION_CC:
       return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SECTION_CC);
@@ skipping 457 matching lines @@
   if (had_autocheckout_error_) {
     notifications.push_back(DialogNotification(
         DialogNotification::AUTOCHECKOUT_ERROR,
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_AUTOCHECKOUT_ERROR)));
   }
 
   return notifications;
 }
 
 void AutofillDialogControllerImpl::StartSignInFlow() {
+  DCHECK(!IsPayingWithWallet());
   DCHECK(registrar_.IsEmpty());
 
   content::Source<content::NavigationController> source(view_->ShowSignIn());
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, source);
 }
 
 void AutofillDialogControllerImpl::EndSignInFlow() {
   DCHECK(!registrar_.IsEmpty());
   registrar_.RemoveAll();
   view_->HideSignIn();
 }
 
 void AutofillDialogControllerImpl::NotificationCheckboxStateChanged(
     DialogNotification::Type type, bool checked) {
   if (type == DialogNotification::WALLET_USAGE_CONFIRMATION) {
-    int command = checked ? AccountChooserModel::kWalletItemId :
-                            AccountChooserModel::kAutofillItemId;
-    account_chooser_model_.ExecuteCommand(command, 0);
+    if (checked)
+      account_chooser_model_.SelectActiveWalletAccount();
+    else
+      account_chooser_model_.SelectAutofillData();
   }
 }
 
 void AutofillDialogControllerImpl::LegalDocumentLinkClicked(
     const ui::Range& range) {
 #if !defined(OS_ANDROID)
   for (size_t i = 0; i < legal_document_link_ranges_.size(); ++i) {
     if (legal_document_link_ranges_[i] == range) {
       chrome::NavigateParams params(
           chrome::FindBrowserWithWebContents(web_contents()),
@@ skipping 117 matching lines @@
 
 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 (account_chooser_model_.WalletIsSelected())
+
+    if (account_chooser_model_.WalletIsSelected()) {
       GetWalletItems();
+    } else {
+      // The sign-in flow means that the user implicitly switched the account
+      // to the Wallet.  This will trigger AccountChoiceChanged.

[Evan Stade, 2013/04/12 17:06:36]

one space after period (to be consistent with this file)

[aruslan, 2013/04/12 20:43:30]

Done.

+      account_chooser_model_.SelectActiveWalletAccount();
+    }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SuggestionsMenuModelDelegate implementation.
 
 void AutofillDialogControllerImpl::SuggestionItemSelected(
     const SuggestionsMenuModel& model) {
   const DialogSection section = SectionForSuggestionsMenuModel(model);
   EditCancelledForSection(section);
@@ skipping 41 matching lines @@
     return;
   }
 
   SuggestionsUpdated();
   view_->UpdateNotificationArea();
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::OnPassiveSigninSuccess(
     const std::string& username) {
-  current_username_ = username;
+  const string16 username16 = UTF8ToUTF16(username);
   signin_helper_.reset();
+  account_chooser_model_.SetActiveWalletAccountName(username16);
   GetWalletItems();
 }
 
 void AutofillDialogControllerImpl::OnUserNameFetchSuccess(
     const std::string& username) {
-  current_username_ = username;
+  const string16 username16 = UTF8ToUTF16(username);
   signin_helper_.reset();
+  account_chooser_model_.SetActiveWalletAccountName(username16);
   OnWalletOrSigninUpdate();
 }
 
 void AutofillDialogControllerImpl::OnAutomaticSigninSuccess(
     const std::string& username) {
-  // TODO(aruslan): automatic sign-in.
   NOTIMPLEMENTED();
 }
 
 void AutofillDialogControllerImpl::OnPassiveSigninFailure(
     const GoogleServiceAuthError& error) {
   // TODO(aruslan): report an error.
-  LOG(ERROR) << "failed to passively sign-in: " << error.ToString();
+  LOG(ERROR) << "failed to passively sign in: " << error.ToString();
   OnWalletSigninError();
 }
 
 void AutofillDialogControllerImpl::OnUserNameFetchFailure(
     const GoogleServiceAuthError& error) {
   // TODO(aruslan): report an error.
   LOG(ERROR) << "failed to fetch the user account name: " << error.ToString();
   OnWalletSigninError();
 }
 
 void AutofillDialogControllerImpl::OnAutomaticSigninFailure(
     const GoogleServiceAuthError& error) {
-  // TODO(aruslan): automatic sign-in failure.
-  NOTIMPLEMENTED();
+  // TODO(aruslan): report an error.
+  LOG(ERROR) << "failed to automatically sign in: " << error.ToString();
+  OnWalletSigninError();
 }
 
 void AutofillDialogControllerImpl::OnDidGetWalletItems(
     scoped_ptr<wallet::WalletItems> wallet_items) {
   DCHECK(account_chooser_model_.WalletIsSelected());
-
   legal_documents_text_.clear();
   legal_document_link_ranges_.clear();
 
   // TODO(dbeam): verify all items support kCartCurrency?
   wallet_items_ = wallet_items.Pass();
   OnWalletOrSigninUpdate();
 }
 
 void AutofillDialogControllerImpl::OnDidSaveAddress(
     const std::string& address_id,
@@ skipping 56 matching lines @@
   DisableWallet();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PersonalDataManagerObserver implementation.
 
 void AutofillDialogControllerImpl::OnPersonalDataChanged() {
   SuggestionsUpdated();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// AccountChooserModelDelegate implementation.
+
 void AutofillDialogControllerImpl::AccountChoiceChanged() {
   // Whenever the user changes the account, all manual inputs should be reset.
   ResetManualInputForSection(SECTION_EMAIL);
   ResetManualInputForSection(SECTION_CC);
   ResetManualInputForSection(SECTION_BILLING);
   ResetManualInputForSection(SECTION_CC_BILLING);
   ResetManualInputForSection(SECTION_SHIPPING);
 
   if (is_submitting_)
     GetWalletClient()->CancelRequests();
 
   SetIsSubmitting(false);
 
-  if (account_chooser_model_.WalletIsSelected() && !wallet_items_)
-    GetWalletItems();
+  if (!signin_helper_ && account_chooser_model_.WalletIsSelected()) {
+    if (account_chooser_model_.IsActiveWalletAccountSelected()) {
+      // If the user has chosen an already active Wallet account, and we don't
+      // have the Wallet items, an attempt to fetch the Wallet data is made to
+      // see if the user is still signed in.
+      // This will trigger a passive sign-in if required.
+      if (!wallet_items_)
+        GetWalletItems();
+    } else {
+      // TODO(aruslan): trigger the automatic sign-in process.
+      LOG(ERROR) << "failed to initiate an automatic sign-in";
+      OnWalletSigninError();
+    }
+  }
 
   SuggestionsUpdated();
+  UpdateAccountChooserView();
+}
 
+void AutofillDialogControllerImpl::UpdateAccountChooserView() {
   if (view_) {
     view_->UpdateAccountChooser();
     view_->UpdateNotificationArea();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 bool AutofillDialogControllerImpl::HandleKeyPressEventInInput(
     const content::NativeWebKeyboardEvent& event) {
@@ skipping 72 matching lines @@
   return account_chooser_model_.WalletIsSelected() &&
          SignedInState() == SIGNED_IN;
 }
 
 bool AutofillDialogControllerImpl::IsFirstRun() const {
   return is_first_run_;
 }
 
 void AutofillDialogControllerImpl::DisableWallet() {
   signin_helper_.reset();
-  current_username_.clear();
   account_chooser_model_.SetHadWalletError();
   GetWalletClient()->CancelRequests();
   wallet_items_.reset();
   full_wallet_.reset();
   SetIsSubmitting(false);
 }
 
 void AutofillDialogControllerImpl::SuggestionsUpdated() {
   suggested_email_.Reset();
   suggested_cc_.Reset();
   suggested_billing_.Reset();
   suggested_cc_billing_.Reset();
   suggested_shipping_.Reset();
   HidePopup();
 
   if (IsPayingWithWallet()) {
-    // TODO(estade): fill in the email address.
+    if (!account_chooser_model_.active_wallet_account_name().empty()) {
+      suggested_email_.AddKeyedItem(
+          base::IntToString(0),
+          account_chooser_model_.active_wallet_account_name());
+    }
 
     const std::vector<wallet::Address*>& addresses =
         wallet_items_->addresses();
     for (size_t i = 0; i < addresses.size(); ++i) {
       // TODO(dbeam): respect wallet_items_->default_instrument_id().
       suggested_shipping_.AddKeyedItemWithSublabel(
           base::IntToString(i),
           addresses[i]->DisplayName(),
           addresses[i]->DisplayNameDetail());
     }
@@ skipping 445 matching lines @@
         AutofillMetrics::DIALOG_USER_SIGNED_IN_NO_WALLET_NO_AUTOFILL;
   }
 
   // Has Wallet items.
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 }  // namespace autofill