Removes SimpleMenuModel::FlipIndex. It was only used by

ui/base/models/simple_menu_model.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 "ui/base/models/simple_menu_model.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
@@ skipping 155 matching lines @@
 
 void SimpleMenuModel::InsertCheckItemAt(
     int index, int command_id, const string16& label) {
   Item item = { command_id, label, gfx::Image(), TYPE_CHECK, -1, NULL,
                 NULL, NORMAL_SEPARATOR };
   InsertItemAtIndex(item, index);
 }
 
 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(
     int index, int command_id, const string16& label, int group_id) {
   Item item = { command_id, label, gfx::Image(), TYPE_RADIO, group_id, NULL,
                 NULL, NORMAL_SEPARATOR };
   InsertItemAtIndex(item, index);
 }
 
 void SimpleMenuModel::InsertRadioItemWithStringIdAt(
@@ skipping 18 matching lines @@
 void SimpleMenuModel::SetIcon(int index, const gfx::Image& icon) {
   items_[ValidateItemIndex(index)].icon = icon;
 }
 
 void SimpleMenuModel::Clear() {
   items_.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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel, MenuModel implementation:
 
 bool SimpleMenuModel::HasIcons() const {
   for (ItemVector::const_iterator i = items_.begin(); i != items_.end(); ++i) {
     if (!i->icon.IsEmpty())
       return true;
   }
 
   return false;
 }
 
 int SimpleMenuModel::GetItemCount() const {
   return static_cast<int>(items_.size());
 }
 
 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 {
   if (delegate_)
     return delegate_->IsItemForCommandIdDynamic(GetCommandIdAt(index));
   return false;
 }
 
 bool SimpleMenuModel::GetAcceleratorAt(int index,
                                        ui::Accelerator* accelerator) const {
   if (delegate_) {
     return delegate_->GetAcceleratorForCommandId(GetCommandIdAt(index),
                                                  accelerator);
   }
   return false;
 }
 
 bool SimpleMenuModel::IsItemCheckedAt(int index) const {
   if (!delegate_)
     return false;
   MenuModel::ItemType item_type = GetTypeAt(index);
   return (item_type == TYPE_CHECK || item_type == TYPE_RADIO) ?
       delegate_->IsCommandIdChecked(GetCommandIdAt(index)) : false;
 }
 
 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) {
   if (IsItemDynamicAt(index))
     return delegate_->GetIconForCommandId(GetCommandIdAt(index), icon);
 
   ValidateItemIndex(index);
   if (items_[index].icon.IsEmpty())
     return false;
 
   *icon = items_[index].icon;
   return true;
 }
 
 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 {
   int command_id = GetCommandIdAt(index);
   if (!delegate_ || command_id == kSeparatorId || GetButtonMenuItemAt(index))
     return true;
   return delegate_->IsCommandIdEnabled(command_id);
 }
 
 bool SimpleMenuModel::IsVisibleAt(int index) const {
@@ skipping 12 matching lines @@
   if (delegate_)
     delegate_->ExecuteCommand(GetCommandIdAt(index));
 }
 
 void SimpleMenuModel::ActivatedAt(int index, int event_flags) {
   if (delegate_)
     delegate_->ExecuteCommand(GetCommandIdAt(index), event_flags);
 }
 
 MenuModel* SimpleMenuModel::GetSubmenuModelAt(int index) const {
-  return items_[ValidateItemIndex(FlipIndex(index))].submenu;
+  return items_[ValidateItemIndex(index)].submenu;
 }
 
 void SimpleMenuModel::MenuWillShow() {
   if (delegate_)
     delegate_->MenuWillShow(this);
 }
 
 void SimpleMenuModel::MenuClosed() {
   // Due to how menus work on the different platforms, ActivatedAt will be
   // called after this.  It's more convenient for the delegate to be called
@@ skipping 10 matching lines @@
 
 MenuModelDelegate* SimpleMenuModel::GetMenuModelDelegate() const {
   return menu_model_delegate_;
 }
 
 void SimpleMenuModel::OnMenuClosed() {
   if (delegate_)
     delegate_->MenuClosed(this);
 }
 
-int SimpleMenuModel::FlipIndex(int index) const {
-  return index;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel, Private:
 
 int SimpleMenuModel::ValidateItemIndex(int index) const {
   CHECK_GE(index, 0);
   CHECK_LT(static_cast<size_t>(index), items_.size());
   return index;
 }
 
 void SimpleMenuModel::AppendItem(const Item& item) {
   ValidateItem(item);
   items_.push_back(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) {
 #ifndef NDEBUG
   if (item.type == TYPE_SEPARATOR) {
     DCHECK_EQ(item.command_id, kSeparatorId);
   } else {
     DCHECK_GE(item.command_id, 0);
   }
 #endif  // NDEBUG
 }
 
 }  // namespace ui