| Index: views/controls/menu/menu_item_view.cc
|
| ===================================================================
|
| --- views/controls/menu/menu_item_view.cc (revision 86083)
|
| +++ views/controls/menu/menu_item_view.cc (working copy)
|
| @@ -40,7 +40,7 @@
|
| SetTitle(UTF16ToWide(
|
| l10n_util::GetStringUTF16(IDS_APP_MENU_EMPTY_SUBMENU)));
|
| // Set this so that we're not identified as a normal menu item.
|
| - SetID(kEmptyMenuItemViewID);
|
| + set_id(kEmptyMenuItemViewID);
|
| SetEnabled(false);
|
| }
|
|
|
| @@ -441,7 +441,7 @@
|
| return NULL;
|
| for (int i = 0; i < GetSubmenu()->child_count(); ++i) {
|
| View* child = GetSubmenu()->GetChildViewAt(i);
|
| - if (child->GetID() == MenuItemView::kMenuItemViewID) {
|
| + if (child->id() == MenuItemView::kMenuItemViewID) {
|
| MenuItemView* result = static_cast<MenuItemView*>(child)->
|
| GetMenuItemByID(id);
|
| if (result)
|
| @@ -555,7 +555,7 @@
|
| submenu_ = NULL;
|
| show_mnemonics_ = false;
|
| // Assign our ID, this allows SubmenuItemView to find MenuItemViews.
|
| - SetID(kMenuItemViewID);
|
| + set_id(kMenuItemViewID);
|
| has_icons_ = false;
|
|
|
| MenuDelegate* root_delegate = GetDelegate();
|
| @@ -648,11 +648,11 @@
|
| // view count.
|
| for (int i = submenu_->child_count() - 1; i >= 0; --i) {
|
| View* child = submenu_->GetChildViewAt(i);
|
| - if (child->GetID() == MenuItemView::kMenuItemViewID) {
|
| + if (child->id() == MenuItemView::kMenuItemViewID) {
|
| MenuItemView* menu_item = static_cast<MenuItemView*>(child);
|
| if (menu_item->HasSubmenu())
|
| menu_item->RemoveEmptyMenus();
|
| - } else if (child->GetID() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
|
| + } else if (child->id() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
|
| submenu_->RemoveChildView(child);
|
| delete child;
|
| child = NULL;
|
|
|