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 444 matching lines @@
     return REQUIRES_PASSIVE_SIGN_IN;
 
   return SIGNED_IN;
 }
 
 bool AutofillDialogControllerImpl::ShouldShowSpinner() const {
   return IsPayingWithWallet() && SignedInState() == REQUIRES_RESPONSE;
 }
 
 string16 AutofillDialogControllerImpl::AccountChooserText() const {
+  // TODO(aruslan): this should be l10n "Not using Google Wallet".
   if (!IsPayingWithWallet())
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PAY_WITHOUT_WALLET);
 
-  // TODO(dbeam): real strings and l10n.
   if (SignedInState() == SIGNED_IN)
-    return ASCIIToUTF16(current_username_);
+    return ASCIIToUTF16(account_chooser_model_.GetCurrentlySignedInAccount());
 
   // In this case, the account chooser should be showing the signin link.
   return string16();
 }
 
 string16 AutofillDialogControllerImpl::SignInLinkText() const {
   // TODO(estade): real strings and l10n.
   return ASCIIToUTF16("Sign in to use Google Wallet");
 }
 
@@ skipping 41 matching lines @@
       std::vector<wallet::WalletClient::RiskCapability>());
 }
 
 void AutofillDialogControllerImpl::OnWalletOrSigninUpdate() {
   if (wallet_items_.get()) {
     DCHECK(IsPayingWithWallet());
     DCHECK(!signin_helper_.get());
     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_.GetCurrentlySignedInAccount().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();
+        account_chooser_model_.ResetCurrentlySignedInAccount();
         signin_helper_.reset(new wallet::WalletSigninHelper(
             this,
             profile_->GetRequestContext()));
         signin_helper_->StartPassiveSignin();
         break;
 
       case REQUIRES_RESPONSE:
         NOTREACHED();
     }
   }
@@ skipping 43 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 (IsPayingWithWallet() && SignedInState() != SIGNED_IN)
+  // If there is no accounts to choose from except the autofill data,
+  // there is no menu, just a sign in link.

[Evan Stade, 2013/03/29 23:08:45]

comment is hard to follow. "Autofill data" is not an account.

[aruslan, 2013/03/30 00:07:47]

Done.

+  if (!account_chooser_model_.HasAccountsToChoose())
     return NULL;
 
   return &account_chooser_model_;
 }
 
 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()),

[Evan Stade, 2013/03/29 23:08:45]

isn't the checked item already an index? aren't index and command id synonymous
for the account chooser?

[aruslan, 2013/03/30 00:07:47]

Not anymore; do you suggest it should be?
Command-ids are simpler as they allow to express the fact that the user attempts
to sign into the Wallet, but we don't know what this account is; or that the
only option the user has is to pay without the Wallet.

+      &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 396 matching lines @@
         DialogNotification::WALLET_ERROR,
         l10n_util::GetStringFUTF16(
             IDS_AUTOFILL_DIALOG_COMPLETE_WITHOUT_WALLET,
             ASCIIToUTF16("Oops, [Wallet-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();
@@ skipping 98 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 (IsPayingWithWallet())
-      StartFetchingWalletItems();
+    // The sign-in flow means that the user implicitly switched the account
+    // to the Wallet.  This will trigger AccountChoiceChanged.
+    DCHECK(!IsPayingWithWallet());
+    account_chooser_model_.ForceWalletAccountSelected();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SuggestionsMenuModelDelegate implementation.
 
 void AutofillDialogControllerImpl::SuggestionItemSelected(
     const SuggestionsMenuModel& model) {
   DialogSection section = SectionForSuggestionsMenuModel(model);
   section_editing_state_[section] = false;
@@ skipping 36 matching lines @@
 
   if (full_wallet_->HasRequiredAction(wallet::VERIFY_CVV))
     DisableWallet();
   else
     FinishSubmit();
 }
 
 void AutofillDialogControllerImpl::OnPassiveSigninSuccess(
     const std::string& username) {
   DCHECK(IsPayingWithWallet());
-  current_username_ = username;
+  account_chooser_model_.SetCurrentlySignedInAccount(username);
   signin_helper_.reset();
   wallet_items_.reset();
   StartFetchingWalletItems();
 }
 
 void AutofillDialogControllerImpl::OnUserNameFetchSuccess(
     const std::string& username) {
   DCHECK(IsPayingWithWallet());
-  current_username_ = username;
+  account_chooser_model_.SetCurrentlySignedInAccount(username);
   signin_helper_.reset();
   OnWalletOrSigninUpdate();
 }
 
 void AutofillDialogControllerImpl::OnAutomaticSigninSuccess(
     const std::string& username) {
   // TODO(aruslan): automatic sign-in.
   NOTIMPLEMENTED();
 }
 
@@ skipping 87 matching lines @@
 void AutofillDialogControllerImpl::OnPersonalDataChanged() {
   HidePopup();
   GenerateSuggestionsModels();
   view_->ModelChanged();
 }
 
 void AutofillDialogControllerImpl::AccountChoiceChanged() {
   if (!view_)
     return;
 
-  // Whenever the user changes the current account, the Wallet data should be
-  // cleared. If the user has chosen a Wallet account, 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.
-  // TODO(aruslan): integrate an automatic sign-in.
+  // The Wallet data should be cleared when the user switches accounts.
   wallet_items_.reset();
-  if (IsPayingWithWallet())
-    StartFetchingWalletItems();
+  if (IsPayingWithWallet()) {
+      if (account_chooser_model_.IsCurrentlySignedInAccountSelected()) {
+        // If the user has chosen a content-area Wallet account, 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.
+        StartFetchingWalletItems();
+      } else {
+        // TODO(aruslan): integrate an automatic sign-in.
+        OnWalletSigninError();
+      }
+  }
 
   GenerateSuggestionsModels();
   view_->ModelChanged();
   view_->UpdateAccountChooser();
   view_->UpdateNotificationArea();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 bool AutofillDialogControllerImpl::HandleKeyPressEventInInput(
@@ skipping 32 matching lines @@
 wallet::WalletClient* AutofillDialogControllerImpl::GetWalletClient() {
   return &wallet_client_;
 }
 
 bool AutofillDialogControllerImpl::IsPayingWithWallet() const {
   return account_chooser_model_.WalletIsSelected();
 }
 
 void AutofillDialogControllerImpl::DisableWallet() {
   signin_helper_.reset();
-  current_username_.clear();
   account_chooser_model_.SetHadWalletError();
   GetWalletClient()->CancelPendingRequests();
 }
 
 void AutofillDialogControllerImpl::OnWalletSigninError() {
   signin_helper_.reset();
-  current_username_.clear();
   account_chooser_model_.SetHadWalletSigninError();
   GetWalletClient()->CancelPendingRequests();
 }
 
 bool AutofillDialogControllerImpl::IsFirstRun() const {
   PrefService* prefs = profile_->GetPrefs();
   return !prefs->HasPrefPath(prefs::kAutofillDialogPayWithoutWallet);
 }
 
 void AutofillDialogControllerImpl::GenerateSuggestionsModels() {
@@ skipping 428 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