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

trunk/src/chrome/browser/ui/autofill/autofill_dialog_models.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_MODELS_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_MODELS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace autofill {
 
 class SuggestionsMenuModel;
 
 class SuggestionsMenuModelDelegate {
  public:
   virtual ~SuggestionsMenuModelDelegate();
 
   // Called when a menu item has been activated.
-  virtual void SuggestionItemSelected(SuggestionsMenuModel* model,
-                                      size_t index) = 0;
+  virtual void SuggestionItemSelected(const SuggestionsMenuModel& model) = 0;
 };
 
 // A model for the dropdowns that allow the user to select from different
 // sets of known data. It wraps a SimpleMenuModel, providing a mapping between
 // index and item GUID.
 class SuggestionsMenuModel : public ui::SimpleMenuModel,
                              public ui::SimpleMenuModel::Delegate {
  public:
   explicit SuggestionsMenuModel(SuggestionsMenuModelDelegate* delegate);
   virtual ~SuggestionsMenuModel();
@@ skipping 23 matching lines @@
   // Resets the model to empty.
   void Reset();
 
   // Returns the ID key for the item at |index|.
   std::string GetItemKeyAt(int index) const;
 
   // Returns the ID key for the item at |checked_item_|, or an empty string if
   // there are no items.
   std::string GetItemKeyForCheckedItem() const;
 
-  // Sets which item is checked.
-  void SetCheckedItem(const std::string& item_key);
-  void SetCheckedIndex(size_t index);
-
   int checked_item() { return checked_item_; }
 
   // ui::SimpleMenuModel::Delegate implementation.
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
 
  private:
   // The items this model represents, in presentation order. The first
   // string is the "key" which identifies the item. The second is the
   // display string for the item.
   std::vector<std::pair<std::string, string16> > items_;
 
   SuggestionsMenuModelDelegate* delegate_;
 
-  // The command id (and index) of the item which is currently checked. Only one
-  // item is checked at a time.
+  // The command id (and index) of the item which is currently checked.
   int checked_item_;
 
   DISALLOW_COPY_AND_ASSIGN(SuggestionsMenuModel);
 };
 
 // A model for possible months in the Gregorian calendar.
 class MonthComboboxModel : public ui::ComboboxModel {
  public:
   MonthComboboxModel();
   virtual ~MonthComboboxModel();
@@ skipping 21 matching lines @@
  private:
   // The current year (e.g., 2012).
   int this_year_;
 
   DISALLOW_COPY_AND_ASSIGN(YearComboboxModel);
 };
 
 }  // autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_MODELS_H_