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

Unified Diff: ui/views/controls/menu/menu_controller.cc

Issue 1514693006: Revert of Use a single views::MenuConfig instance for each platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase revert on https://codereview.chromium.org/1504743003 Created 5 years 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/views/controls/menu/menu_config_win.cc ('k') | ui/views/controls/menu/menu_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 43f167e025548e468988a34869f4da48960fce8d..bc718eff70ce3a0ed357e28858ec1ca18f9dcf2f 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -1692,8 +1692,9 @@ 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(MenuConfig::instance().show_delay),
+ FROM_HERE, TimeDelta::FromMilliseconds(item->GetMenuConfig().show_delay),
this, &MenuController::CommitPendingSelection);
}
@@ -1736,7 +1737,7 @@ gfx::Rect MenuController::CalculateMenuBounds(MenuItemView* item,
int x, y;
- const MenuConfig& menu_config = MenuConfig::instance();
+ const MenuConfig& menu_config = item->GetMenuConfig();
if (!item->GetParentMenuItem()) {
// First item, position relative to initial location.
« no previous file with comments | « ui/views/controls/menu/menu_config_win.cc ('k') | ui/views/controls/menu/menu_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698