Index: ash/accelerators/accelerator_controller.h |
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h |
index de9608ecb4acd4a8e1616f4e66596bc14003b0d1..6dc7c057a2f4842e79d4f6ab584a2ee611dd8d6d 100644 |
--- a/ash/accelerators/accelerator_controller.h |
+++ b/ash/accelerators/accelerator_controller.h |
@@ -113,6 +113,13 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget { |
return &exit_warning_handler_; |
} |
+ // Checks if the given accelerator can be performed without the need to close |
+ // the menu (if one is present), returns true if this is the case, and false |
+ // otherwise (the menu should be closed and the accelerator should continue |
+ // its normal propagation). |
+ bool ShouldMenuBeKeptOpenForAccelerator( |
pkotwicz
2015/08/26 01:26:54
I think that it would be clearer if this method wa
afakhry
2015/08/26 18:39:21
Done.
|
+ const ui::Accelerator& accelerator) const; |
+ |
ui::AcceleratorHistory* accelerator_history() { |
return accelerator_history_.get(); |
} |
@@ -192,6 +199,8 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget { |
std::set<int> actions_allowed_in_app_mode_; |
// Actions disallowed if there are no windows. |
std::set<int> actions_needing_window_; |
+ // Actions that can be performed without closing the menu (if one is present). |
+ std::set<int> actions_keeping_menu_open_; |
DISALLOW_COPY_AND_ASSIGN(AcceleratorController); |
}; |