Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5660)

Unified Diff: chrome/browser/ui/autofill/autofill_dialog_models.cc

Issue 13331007: Multi-account AccountChooser for interactive autocomplete. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/autofill/autofill_dialog_models.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_models.cc b/chrome/browser/ui/autofill/autofill_dialog_models.cc
index ed50352ece95f161686a3c5cc87c2a1a9014a8a6..b5419dec9ea3c8984710d827f8b1e18002f7412c 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_models.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_models.cc
@@ -96,71 +96,6 @@ void SuggestionsMenuModel::ExecuteCommand(int command_id, int event_flags) {
delegate_->SuggestionItemSelected(*this);
}
-// AccountChooserModel ---------------------------------------------------------
-
-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),
- checked_item_(prefs->GetBoolean(prefs::kAutofillDialogPayWithoutWallet) ?
- kAutofillItemId : kWalletItemId),
- had_wallet_error_(false) {
- 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);
-}
-
-AccountChooserModel::~AccountChooserModel() {
-}
-
-bool AccountChooserModel::IsCommandIdChecked(int command_id) const {
- return command_id == checked_item_;
-}
-
-bool AccountChooserModel::IsCommandIdEnabled(int command_id) const {
- if (command_id == kWalletItemId && had_wallet_error_)
- return false;
-
- return true;
-}
-
-bool AccountChooserModel::GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) {
- return false;
-}
-
-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;
- ExecuteCommand(kAutofillItemId, 0);
-}
-
-void AccountChooserModel::SetHadWalletSigninError() {
- ExecuteCommand(kAutofillItemId, 0);
-}
-
-bool AccountChooserModel::WalletIsSelected() const {
- return checked_item_ == kWalletItemId;
-}
-
// MonthComboboxModel ----------------------------------------------------------
MonthComboboxModel::MonthComboboxModel() {}

Powered by Google App Engine
This is Rietveld 408576698