Multi-account AccountChooser for interactive autocomplete.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index adfaccb1d8a3ff0fdbcd575b3de32f41faccb768..f99ee66e7c1f7f9a982d9e252eb4ed565aa589d5 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -13,6 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
+#include "chrome/browser/ui/autofill/account_chooser_model.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
@@ -204,18 +205,16 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
 
   // AccountChooserModelDelegate implementation.
   virtual void AccountChoiceChanged() OVERRIDE;
+  virtual void UpdateAccountChooserView() OVERRIDE;
 
   // wallet::WalletSigninHelperDelegate implementation.
-  virtual void OnPassiveSigninSuccess(
-      const std::string& auth_username) OVERRIDE;
+  virtual void OnPassiveSigninSuccess(const std::string& username) OVERRIDE;
   virtual void OnPassiveSigninFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
-  virtual void OnAutomaticSigninSuccess(
-      const std::string& auth_username) OVERRIDE;
+  virtual void OnAutomaticSigninSuccess(const std::string& username) OVERRIDE;
   virtual void OnAutomaticSigninFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
-  virtual void OnUserNameFetchSuccess(
-      const std::string& auth_username) OVERRIDE;
+  virtual void OnUserNameFetchSuccess(const std::string& username) OVERRIDE;
   virtual void OnUserNameFetchFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
 
@@ -274,6 +273,10 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
   // Starts fetching the wallet items from Online Wallet.
   void GetWalletItems();
 
+  // Handles the SignedInState() on Wallet or sign-in state update.
+  // Triggers the user name fetch and the passive/automatic sign-in.
+  void SignedInStateUpdated();
+
   // Refreshes the model on Wallet or sign-in state update.
   void OnWalletOrSigninUpdate();
 
@@ -450,12 +453,6 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
   // The helper is set only during fetch/sign-in, and NULL otherwise.
   scoped_ptr<wallet::WalletSigninHelper> signin_helper_;
 
-  // The user account name (email).
-  // Valid only if PayingWithWallet() and SigninState() == SIGNED_IN.
-  // Set whenever the sign-in helper fetches the user info.
-  // TODO(aruslan): this should be removed (AccountChooser should deal with it).
-  std::string current_username_;
-
   // A client to talk to the Online Wallet API.
   wallet::WalletClient wallet_client_;