Change the behavior of the [X] Save details to Wallet checkbox notification to:

chrome/browser/ui/autofill/autofill_dialog_models.cc

 // Copyright (c) 2012 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_models.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 90 matching lines @@
 const int AccountChooserModel::kWalletItemId = 0;
 const int AccountChooserModel::kAutofillItemId = 1;
 
 AccountChooserModelDelegate::~AccountChooserModelDelegate() {}
 
 AccountChooserModel::AccountChooserModel(
     AccountChooserModelDelegate* delegate,
     PrefService* prefs)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       account_delegate_(delegate),
-      prefs_(prefs),
-      checked_item_(kWalletItemId),
+      checked_item_(prefs->GetBoolean(prefs::kAutofillDialogPayWithoutWallet) ?
+          kAutofillItemId : kWalletItemId),
       had_wallet_error_(false) {
-  pref_change_registrar_.Init(prefs);
-  pref_change_registrar_.Add(
-      prefs::kAutofillDialogPayWithoutWallet,
-      base::Bind(&AccountChooserModel::PrefChanged, base::Unretained(this)));
-
   AddCheckItem(kWalletItemId,
                l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_GOOGLE_WALLET));
   SetIcon(
       kWalletItemId,
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(IDR_WALLET_ICON));
   AddCheckItemWithStringId(kAutofillItemId,
                            IDS_AUTOFILL_DIALOG_PAY_WITHOUT_WALLET);
-  UpdateCheckmarkFromPref();
 }
 
 AccountChooserModel::~AccountChooserModel() {
 }
 
 bool AccountChooserModel::IsCommandIdChecked(int command_id) const {
   return command_id == checked_item_;
 }
 
 bool AccountChooserModel::IsCommandIdEnabled(int command_id) const {
@@ skipping 12 matching lines @@
 void AccountChooserModel::ExecuteCommand(int command_id, int event_flags) {
   if (checked_item_ == command_id)
     return;
 
   checked_item_ = command_id;
   account_delegate_->AccountChoiceChanged();
 }
 
 void AccountChooserModel::SetHadWalletError() {
   had_wallet_error_ = true;
-  checked_item_ = kAutofillItemId;
-  account_delegate_->AccountChoiceChanged();
+  ExecuteCommand(kAutofillItemId, 0);
 }
 
 void AccountChooserModel::SetHadWalletSigninError() {
-  checked_item_ = kAutofillItemId;
-  account_delegate_->AccountChoiceChanged();
+  ExecuteCommand(kAutofillItemId, 0);
 }
 
 bool AccountChooserModel::WalletIsSelected() const {
   return checked_item_ == kWalletItemId;
 }
 
-void AccountChooserModel::PrefChanged(const std::string& pref) {
-  DCHECK(pref == prefs::kAutofillDialogPayWithoutWallet);
-  UpdateCheckmarkFromPref();
-  account_delegate_->AccountChoiceChanged();
-}
-
-void AccountChooserModel::UpdateCheckmarkFromPref() {
-  if (prefs_->GetBoolean(prefs::kAutofillDialogPayWithoutWallet))
-    checked_item_ = kAutofillItemId;
-  else
-    checked_item_ = kWalletItemId;
-}
-
 // MonthComboboxModel ----------------------------------------------------------
 
 MonthComboboxModel::MonthComboboxModel() {}
 
 MonthComboboxModel::~MonthComboboxModel() {}
 
 int MonthComboboxModel::GetItemCount() const {
   // 12 months plus the empty entry.
   return 13;
 }
@@ skipping 24 matching lines @@
 }
 
 string16 YearComboboxModel::GetItemAt(int index) {
   if (index == 0)
     return string16();
 
   return base::IntToString16(this_year_ + index - 1);
 }
 
 }  // autofill