rAc: better Wallet error messages.

chrome/browser/ui/autofill/account_chooser_model.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/account_chooser_model.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 16 matching lines @@
 AccountChooserModel::AccountChooserModel(
     AccountChooserModelDelegate* delegate,
     PrefService* prefs,
     const AutofillMetrics& metric_logger,
     DialogType dialog_type)
     : ui::SimpleMenuModel(this),
       delegate_(delegate),
       checked_item_(
           prefs->GetBoolean(::prefs::kAutofillDialogPayWithoutWallet) ?
               kAutofillItemId : kActiveWalletItemId),
+      had_wallet_error_(false),
       metric_logger_(metric_logger),
       dialog_type_(dialog_type) {
   ReconstructMenuItems();
 }
 
 AccountChooserModel::~AccountChooserModel() {
 }
 
 void AccountChooserModel::SelectActiveWalletAccount() {
   ExecuteCommand(kActiveWalletItemId, 0);
@@ skipping 19 matching lines @@
   ReconstructMenuItems();
   delegate_->UpdateAccountChooserView();
 }
 
 bool AccountChooserModel::IsCommandIdChecked(int command_id) const {
   return command_id == checked_item_;
 }
 
 bool AccountChooserModel::IsCommandIdEnabled(int command_id) const {
   // Currently, _any_ (non-sign-in) error disables _all_ Wallet accounts.
-  if (command_id != kAutofillItemId && HadWalletError())
+  if (command_id != kAutofillItemId && had_wallet_error_)
     return false;
 
   return true;
 }
 
 bool AccountChooserModel::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
@@ skipping 14 matching lines @@
     chooser_event =
         AutofillMetrics::DIALOG_UI_ACCOUNT_CHOOSER_SWITCHED_WALLET_ACCOUNT;
   }
   metric_logger_.LogDialogUiEvent(dialog_type_, chooser_event);
 
   checked_item_ = command_id;
   ReconstructMenuItems();
   delegate_->AccountChoiceChanged();
 }
 
-void AccountChooserModel::SetHadWalletError(const base::string16& message) {
+void AccountChooserModel::SetHadWalletError() {
   // Any non-sign-in error disables all Wallet accounts.
-  wallet_error_message_ = message;
+  had_wallet_error_ = true;
   ClearActiveWalletAccountName();
   ExecuteCommand(kAutofillItemId, 0);
 }
 
-bool AccountChooserModel::HadWalletError() const {
-  return !wallet_error_message_.empty();
-}
-
 void AccountChooserModel::SetHadWalletSigninError() {
   ClearActiveWalletAccountName();
   ExecuteCommand(kAutofillItemId, 0);
 }
 
 bool AccountChooserModel::WalletIsSelected() const {
   return checked_item_ != kAutofillItemId;
 }
 
 bool AccountChooserModel::IsActiveWalletAccountSelected() const {
@@ skipping 15 matching lines @@
     // A throbber should be shown until the Wallet account name is set.
     AddCheckItem(kActiveWalletItemId,
                  l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_GOOGLE_WALLET));
   }
 
   AddCheckItemWithStringId(kAutofillItemId,
                            IDS_AUTOFILL_DIALOG_PAY_WITHOUT_WALLET);
 }
 
 }  // namespace autofill