Revert 195316 "Remove "Use billing for shipping" checkbox in fav..."

trunk/src/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 57 matching lines @@
   return items_[index].first;
 }
 
 std::string SuggestionsMenuModel::GetItemKeyForCheckedItem() const {
   if (items_.empty())
     return std::string();
 
   return items_[checked_item_].first;
 }
 
-void SuggestionsMenuModel::SetCheckedItem(const std::string& item_key) {
-  for (size_t i = 0; i < items_.size(); ++i) {
-    if (items_[i].first == item_key) {
-      checked_item_ = i;
-      return;
-    }
-  }
-
-  NOTREACHED();
-}
-
-void SuggestionsMenuModel::SetCheckedIndex(size_t index) {
-  DCHECK_LE(index, items_.size());
-  checked_item_ = index;
-}
-
 bool SuggestionsMenuModel::IsCommandIdChecked(
     int command_id) const {
   return checked_item_ == command_id;
 }
 
 bool SuggestionsMenuModel::IsCommandIdEnabled(
     int command_id) const {
   return true;
 }
 
 bool SuggestionsMenuModel::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
 
 void SuggestionsMenuModel::ExecuteCommand(int command_id, int event_flags) {
-  delegate_->SuggestionItemSelected(this, command_id);
+  checked_item_ = command_id;
+  delegate_->SuggestionItemSelected(*this);
 }
 
 // MonthComboboxModel ----------------------------------------------------------
 
 MonthComboboxModel::MonthComboboxModel() {}
 
 MonthComboboxModel::~MonthComboboxModel() {}
 
 int MonthComboboxModel::GetItemCount() const {
   // 12 months plus the empty entry.
@@ skipping 26 matching lines @@
 }
 
 string16 YearComboboxModel::GetItemAt(int index) {
   if (index == 0)
     return string16();
 
   return base::IntToString16(this_year_ + index - 1);
 }
 
 }  // autofill