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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/focus/focus_manager.cc

Issue 1177773002: Deprecating high-conflict accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified the design, modified tests accordingly, made accelerators consumable by webcontents if n… Created 5 years, 6 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
« ui/views/focus/focus_manager.h ('K') | « ui/views/focus/focus_manager.h ('k') | ui/views/focus/focus_manager_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_manager.cc
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index c84c3152734d2de2994673aee76b89365884d19d..c15dab45d20c3a8d687a0138e22de92c14b4835b 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -489,6 +489,12 @@ bool FocusManager::ProcessAccelerator(const ui::Accelerator& accelerator) {
return false;
}
+bool FocusManager::IsAcceleratorDeprecated(
+ const ui::Accelerator& accelerator) const {
+ return delegate_.get() &&
+ delegate_.get()->IsAcceleratorDeprecated(accelerator);
+}
+
ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
const ui::Accelerator& accelerator) const {
ui::AcceleratorTarget* target =
« ui/views/focus/focus_manager.h ('K') | « ui/views/focus/focus_manager.h ('k') | ui/views/focus/focus_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698