| Index: views/controls/menu/submenu_view.cc
|
| ===================================================================
|
| --- views/controls/menu/submenu_view.cc (revision 86083)
|
| +++ views/controls/menu/submenu_view.cc (working copy)
|
| @@ -55,7 +55,7 @@
|
| int SubmenuView::GetMenuItemCount() {
|
| int count = 0;
|
| for (int i = 0; i < child_count(); ++i) {
|
| - if (GetChildViewAt(i)->GetID() == MenuItemView::kMenuItemViewID)
|
| + if (GetChildViewAt(i)->id() == MenuItemView::kMenuItemViewID)
|
| count++;
|
| }
|
| return count;
|
| @@ -63,7 +63,7 @@
|
|
|
| MenuItemView* SubmenuView::GetMenuItemAt(int index) {
|
| for (int i = 0, count = 0; i < child_count(); ++i) {
|
| - if (GetChildViewAt(i)->GetID() == MenuItemView::kMenuItemViewID &&
|
| + if (GetChildViewAt(i)->id() == MenuItemView::kMenuItemViewID &&
|
| count++ == index) {
|
| return static_cast<MenuItemView*>(GetChildViewAt(i));
|
| }
|
| @@ -92,7 +92,7 @@
|
| int menu_item_width = width() - insets.width();
|
| for (int i = 0; i < child_count(); ++i) {
|
| View* child = GetChildViewAt(i);
|
| - if (child->IsVisible()) {
|
| + if (child->visible()) {
|
| gfx::Size child_pref_size = child->GetPreferredSize();
|
| child->SetBounds(x, y, menu_item_width, child_pref_size.height());
|
| y += child_pref_size.height();
|
| @@ -109,11 +109,11 @@
|
| int height = 0;
|
| for (int i = 0; i < child_count(); ++i) {
|
| View* child = GetChildViewAt(i);
|
| - gfx::Size child_pref_size = child->IsVisible() ?
|
| + gfx::Size child_pref_size = child->visible() ?
|
| child->GetPreferredSize() : gfx::Size();
|
| max_width = std::max(max_width, child_pref_size.width());
|
| height += child_pref_size.height();
|
| - if (child->GetID() == MenuItemView::kMenuItemViewID) {
|
| + if (child->id() == MenuItemView::kMenuItemViewID) {
|
| MenuItemView* menu = static_cast<MenuItemView*>(child);
|
| max_accelerator_width_ =
|
| std::max(max_accelerator_width_, menu->GetAcceleratorTextWidth());
|
|
|