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

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

Issue 1741093002: Fixes alternating keyboard and mouse hot-tracking in menus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes alternating keyboard and mouse hot-tracking in menus (comments) Created 4 years, 10 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 839b19fa6d64fe84c5fa528e9b0303eae4ed4b21..f4a80d25af354bef84c5a1b219a091fb94f74f03 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -561,6 +561,9 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
void SetInitialHotTrackedView(MenuItemView* item,
SelectionIncrementDirectionType direction);
+ // Updates the current |hot_button_| and its hot tracked state.
+ void SetHotTrackedButton(CustomButton* hot_button);
+
// The active instance.
static MenuController* active_instance_;
@@ -659,6 +662,9 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
// See UpdateActiveMouseView() for details.
const int active_mouse_view_id_;
+ // Current hot tracked child button if any.
+ CustomButton* hot_button_;
+
internal::MenuControllerDelegate* delegate_;
// How deep we are in nested message loops. This should be at most 2 (when
« 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