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

Unified Diff: ash/accelerators/focus_manager_factory.h

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
Index: ash/accelerators/focus_manager_factory.h
diff --git a/ash/accelerators/focus_manager_factory.h b/ash/accelerators/focus_manager_factory.h
index fc14151853dae300eb012e15d06e3dff3bc92b54..8ff6b96c4dccd7d14e3a7c19c52ea80e68761145 100644
--- a/ash/accelerators/focus_manager_factory.h
+++ b/ash/accelerators/focus_manager_factory.h
@@ -31,6 +31,8 @@ class AshFocusManagerFactory : public views::FocusManagerFactory {
bool ProcessAccelerator(const ui::Accelerator& accelerator) override;
ui::AcceleratorTarget* GetCurrentTargetForAccelerator(
const ui::Accelerator& accelerator) const override;
+ bool IsAcceleratorDeprecated(
+ const ui::Accelerator& accelerator) const override;
};
DISALLOW_COPY_AND_ASSIGN(AshFocusManagerFactory);

Powered by Google App Engine
This is Rietveld 408576698