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

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

Issue 1775533002: Fixes incorrect clearing of hot-tracked state when context menu is opened from a menu item (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moves hot_button tracking from MenuController to MenuController::State (unit test) Created 4 years, 9 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 | « no previous file | ui/views/controls/menu/menu_controller.cc » ('j') | ui/views/controls/menu/menu_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index 3741f762a975dab3f5a1b4662e7df6bca23f1e9a..dc21826d6d457c0c926c8cbd635b37dfff1d8da3 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -243,6 +243,10 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
// The selected menu item.
MenuItemView* item;
+ // Used to capture a hot tracked child button when a nested menu is opened
+ // and to restore the hot tracked state when exiting a nested menu.
+ CustomButton* hot_button;
+
// If item has a submenu this indicates if the submenu is showing.
bool submenu_open;
@@ -678,7 +682,7 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
// screen coordinates). Otherwise this will be (0, 0).
gfx::Point menu_start_mouse_press_loc_;
- // Controls behviour differences between an asynchronous run, and other types
+ // Controls behaviour differences between an asynchronous run, and other types
// of run (blocking, drag and drop).
bool async_run_;
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_controller.cc » ('j') | ui/views/controls/menu/menu_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698