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

Unified Diff: ui/base/models/simple_menu_model.cc

Issue 11791039: Removes SimpleMenuModel::FlipIndex. It was only used by (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « ui/base/models/simple_menu_model.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/models/simple_menu_model.cc
diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
index 18acd403095fc8fb2c626c25c7162714a8b18c0f..139bc22dfaf057f100bdb89cbebd36def1d31302 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) {
« no previous file with comments | « ui/base/models/simple_menu_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698