rAc: better Wallet error messages.

chrome/browser/ui/autofill/account_chooser_model.h

Index: chrome/browser/ui/autofill/account_chooser_model.h
diff --git a/chrome/browser/ui/autofill/account_chooser_model.h b/chrome/browser/ui/autofill/account_chooser_model.h
index fd3f001803edeb061e304b025d9d7099e07330d0..5b310d6f027cd2f0c28ec8621901f9c83b3c541e 100644
--- a/chrome/browser/ui/autofill/account_chooser_model.h
+++ b/chrome/browser/ui/autofill/account_chooser_model.h
@@ -78,9 +78,8 @@ class AccountChooserModel : public ui::SimpleMenuModel,
   }
 
   // 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.

 
@@ -98,8 +97,6 @@ class AccountChooserModel : public ui::SimpleMenuModel,
   // 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.
@@ -118,9 +115,8 @@ class AccountChooserModel : public ui::SimpleMenuModel,
   // 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_;