| Index: ui/views/controls/menu/menu_controller.cc
|
| diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
|
| index bdc906f02d080fddeb05067f39d3e3259f0f286d..5b57008021fcad0c0c8ae027fd50bbad772ba49c 100644
|
| --- a/ui/views/controls/menu/menu_controller.cc
|
| +++ b/ui/views/controls/menu/menu_controller.cc
|
| @@ -1678,9 +1678,8 @@ void MenuController::BuildMenuItemPath(MenuItemView* item,
|
| }
|
|
|
| void MenuController::StartShowTimer() {
|
| - MenuItemView* item = pending_state_.item ? pending_state_.item : state_.item;
|
| show_timer_.Start(
|
| - FROM_HERE, TimeDelta::FromMilliseconds(item->GetMenuConfig().show_delay),
|
| + FROM_HERE, TimeDelta::FromMilliseconds(MenuConfig::instance().show_delay),
|
| this, &MenuController::CommitPendingSelection);
|
| }
|
|
|
| @@ -1723,7 +1722,7 @@ gfx::Rect MenuController::CalculateMenuBounds(MenuItemView* item,
|
|
|
| int x, y;
|
|
|
| - const MenuConfig& menu_config = item->GetMenuConfig();
|
| + const MenuConfig& menu_config = MenuConfig::instance();
|
|
|
| if (!item->GetParentMenuItem()) {
|
| // First item, position relative to initial location.
|
|
|