ash/accelerators/focus_manager_factory.cc - Issue 1177773002: Deprecating high-conflict accelerators

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/accelerators/focus_manager_factory.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:

Index: ash/accelerators/focus_manager_factory.cc

diff --git a/ash/accelerators/focus_manager_factory.cc b/ash/accelerators/focus_manager_factory.cc

index 0695fd3e7a099318ae1e973ba03899ef78bd4ba2..5a5568a3c3019d5d9a298a7f4c8755f0dbc17126 100644

--- a/ash/accelerators/focus_manager_factory.cc

+++ b/ash/accelerators/focus_manager_factory.cc

@@ -38,4 +38,11 @@ AshFocusManagerFactory::Delegate::GetCurrentTargetForAccelerator(

return NULL;

}

+bool AshFocusManagerFactory::Delegate::IsAcceleratorDeprecated(

+ const ui::Accelerator& accelerator) const {

+ AcceleratorController* controller =

+ Shell::GetInstance()->accelerator_controller();

+ return controller && controller->IsDeprecated(accelerator);

} // namespace ash