Removes SimpleMenuModel::FlipIndex. It was only used by

SystemMenuModel. I've made it so SystemMenuModel doesn't need it.

This is a precursor to sharing system menu building code among the
frame types.

BUG=none
TEST=none
R=ben@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11791039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175643 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 25 deletions

diff --git a/ui/base/models/menu_model.h b/ui/base/models/menu_model.h
index 45818a7..8b42f60 100644
--- a/ui/base/models/menu_model.h
+++ b/ui/base/models/menu_model.h
@@ -50,6 +50,7 @@ class UI_EXPORT MenuModel {
   // IMPORTANT: If the model implementation returns something _other_ than 0
   //            here, it must offset the values for |index| it passes to the
   //            methods below by this number - this is NOT done automatically!
+  // TODO(sky): remove this from MenuModel. It's confusing.
   virtual int GetFirstItemIndex(gfx::NativeMenu native_menu) const;
 
   // Returns the number of items in the menu.
diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
index 18acd40..139bc22 100644
--- a/ui/base/models/simple_menu_model.cc
+++ b/ui/base/models/simple_menu_model.cc
@@ -173,8 +173,7 @@ void SimpleMenuModel::InsertCheckItemAt(
 
 void SimpleMenuModel::InsertCheckItemWithStringIdAt(
     int index, int command_id, int string_id) {
-  InsertCheckItemAt(
-      FlipIndex(index), command_id, l10n_util::GetStringUTF16(string_id));
+  InsertCheckItemAt(index, command_id, l10n_util::GetStringUTF16(string_id));
 }
 
 void SimpleMenuModel::InsertRadioItemAt(
@@ -213,9 +212,8 @@ void SimpleMenuModel::Clear() {
 
 int SimpleMenuModel::GetIndexOfCommandId(int command_id) {
   for (ItemVector::iterator i = items_.begin(); i != items_.end(); ++i) {
-    if (i->command_id == command_id) {
-      return FlipIndex(static_cast<int>(std::distance(items_.begin(), i)));
-    }
+    if (i->command_id == command_id)
+      return static_cast<int>(std::distance(items_.begin(), i));
   }
   return -1;
 }
@@ -237,21 +235,21 @@ int SimpleMenuModel::GetItemCount() const {
 }
 
 MenuModel::ItemType SimpleMenuModel::GetTypeAt(int index) const {
-  return items_[ValidateItemIndex(FlipIndex(index))].type;
+  return items_[ValidateItemIndex(index)].type;
 }
 
 ui::MenuSeparatorType SimpleMenuModel::GetSeparatorTypeAt(int index) const {
-  return items_[ValidateItemIndex(FlipIndex(index))].separator_type;
+  return items_[ValidateItemIndex(index)].separator_type;
 }
 
 int SimpleMenuModel::GetCommandIdAt(int index) const {
-  return items_[ValidateItemIndex(FlipIndex(index))].command_id;
+  return items_[ValidateItemIndex(index)].command_id;
 }
 
 string16 SimpleMenuModel::GetLabelAt(int index) const {
   if (IsItemDynamicAt(index))
     return delegate_->GetLabelForCommandId(GetCommandIdAt(index));
-  return items_[ValidateItemIndex(FlipIndex(index))].label;
+  return items_[ValidateItemIndex(index)].label;
 }
 
 bool SimpleMenuModel::IsItemDynamicAt(int index) const {
@@ -278,7 +276,7 @@ bool SimpleMenuModel::IsItemCheckedAt(int index) const {
 }
 
 int SimpleMenuModel::GetGroupIdAt(int index) const {
-  return items_[ValidateItemIndex(FlipIndex(index))].group_id;
+  return items_[ValidateItemIndex(index)].group_id;
 }
 
 bool SimpleMenuModel::GetIconAt(int index, gfx::Image* icon) {
@@ -294,7 +292,7 @@ bool SimpleMenuModel::GetIconAt(int index, gfx::Image* icon) {
 }
 
 ButtonMenuItemModel* SimpleMenuModel::GetButtonMenuItemAt(int index) const {
-  return items_[ValidateItemIndex(FlipIndex(index))].button_model;
+  return items_[ValidateItemIndex(index)].button_model;
 }
 
 bool SimpleMenuModel::IsEnabledAt(int index) const {
@@ -327,7 +325,7 @@ void SimpleMenuModel::ActivatedAt(int index, int event_flags) {
 }
 
 MenuModel* SimpleMenuModel::GetSubmenuModelAt(int index) const {
-  return items_[ValidateItemIndex(FlipIndex(index))].submenu;
+  return items_[ValidateItemIndex(index)].submenu;
 }
 
 void SimpleMenuModel::MenuWillShow() {
@@ -358,10 +356,6 @@ void SimpleMenuModel::OnMenuClosed() {
     delegate_->MenuClosed(this);
 }
 
-int SimpleMenuModel::FlipIndex(int index) const {
-  return index;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel, Private:
 
@@ -378,7 +372,7 @@ void SimpleMenuModel::AppendItem(const Item& item) {
 
 void SimpleMenuModel::InsertItemAtIndex(const Item& item, int index) {
   ValidateItem(item);
-  items_.insert(items_.begin() + FlipIndex(index), item);
+  items_.insert(items_.begin() + index, item);
 }
 
 void SimpleMenuModel::ValidateItem(const Item& item) {
diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
index 309b528..8aa9d9b 100644
--- a/ui/base/models/simple_menu_model.h
+++ b/ui/base/models/simple_menu_model.h
@@ -142,13 +142,6 @@ class UI_EXPORT SimpleMenuModel : public MenuModel {
   virtual MenuModelDelegate* GetMenuModelDelegate() const OVERRIDE;
 
  protected:
-  // Some variants of this model (SystemMenuModel) relies on items to be
-  // inserted backwards. This is counter-intuitive for the API, so rather than
-  // forcing customers to insert things backwards, we return the indices
-  // backwards instead. That's what this method is for. By default, it just
-  // returns what it's passed.
-  virtual int FlipIndex(int index) const;
-
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
   Delegate* delegate() { return delegate_; }
 
@@ -157,7 +150,7 @@ class UI_EXPORT SimpleMenuModel : public MenuModel {
 
   typedef std::vector<Item> ItemVector;
 
-  // Caller needs to call FlipIndex() if necessary. Returns |index|.
+  // Returns |index|.
   int ValidateItemIndex(int index) const;
 
   // Functions for inserting items into |items_|.