rAc: better Wallet error messages.

chrome/browser/ui/autofill/account_chooser_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_ACCOUNT_CHOOSER_MODEL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_ACCOUNT_CHOOSER_MODEL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 60 matching lines @@
   // Clears the name of the account used to communicate with the Online Wallet.
   // Any Wallet error automatically clears the currently active account name.
   void ClearActiveWalletAccountName();
 
   // Returns the name of the currently active account, or an empty string.
   const string16& active_wallet_account_name() const {
     return active_wallet_account_name_;
   }
 
   // Disables all Wallet accounts and switches to the local Autofill data.
-  // Should be called when the Wallet server returns an error with the message
-  // to be displayed. If |message| is empty the error state will be cleared.
-  void SetHadWalletError(const base::string16& message);
+  // Should be called when the Wallet server returns an error.
+  void SetHadWalletError();
 
   bool HadWalletError() const;

[Ilya Sherman, 2013/08/29 00:26:11]

nit: inline/hacker_case?

[Evan Stade, 2013/08/30 02:52:21]

Done.

 
   // Switches the dialog to the local Autofill data.
   // Should be called when the Online Wallet sign-in attempt has failed.
   void SetHadWalletSigninError();
 
   // Returns true if the selected account is an Online Wallet account.
   bool WalletIsSelected() const;
 
   // Returns true if the current selection matches the currently active
   // Wallet account.
   bool IsActiveWalletAccountSelected() const;
 
   // Returns the command id of the current selection.
   int checked_item() const { return checked_item_; }
 
-  base::string16 wallet_error_message() const { return wallet_error_message_; }
-
  protected:
   // Command IDs of the items in this menu; protected for the tests.
   // kActiveWalletItemId is the currently active account.
   // kAutofillItemId is "Pay without the Wallet" (local autofill data).
   // In the future, kFirstAdditionalItemId will be added as the first id
   // for additional accounts.
   static const int kActiveWalletItemId;
   static const int kAutofillItemId;
 
  private:
   // Reconstructs the set of menu items.
   void ReconstructMenuItems();
 
   AccountChooserModelDelegate* delegate_;
 
   // The command id of the currently selected item.
   int checked_item_;
 
-  // The message to be displayed if there is a Wallet error. This message is
-  // only non-empty if a Wallet error has occurred.
-  base::string16 wallet_error_message_;
+  // Whether there has been a Wallet error.
+  bool wallet_error_;

[Ilya Sherman, 2013/08/29 00:26:11]

nit: Perhaps |has_wallet_error_|?

[Evan Stade, 2013/08/30 02:52:21]

Done.

 
   // For logging UMA metrics.
   const AutofillMetrics& metric_logger_;
   const DialogType dialog_type_;
 
   // The name (email) of the account currently used in communications with the
   // Online Wallet service.
   string16 active_wallet_account_name_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountChooserModel);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_ACCOUNT_CHOOSER_MODEL_H_