ash/ash.gyp - Issue 2187703003: Wires up registering accelerators from mash with the wm

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/ash.gyp

Issue 2187703003: Wires up registering accelerators from mash with the wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 4 years, 5 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/ash.gyp

diff --git a/ash/ash.gyp b/ash/ash.gyp

index cce92e6487956ffb60fe35ad724b38a63ec71562..153a9c9af2b7b434091e46f3f310b200ed8da2ee 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -13,8 +13,6 @@

'accelerators/accelerator_controller_delegate_aura.h',

'accelerators/accelerator_delegate.cc',

'accelerators/accelerator_delegate.h',

- 'accelerators/focus_manager_factory.cc',

- 'accelerators/focus_manager_factory.h',

'accelerators/key_hold_detector.cc',

'accelerators/key_hold_detector.h',

'accelerators/magnifier_key_scroller.cc',

@@ -53,6 +51,8 @@

'common/accelerators/accelerator_router.h',

'common/accelerators/accelerator_table.cc',

'common/accelerators/accelerator_table.h',

+ 'common/accelerators/ash_focus_manager_factory.cc',

+ 'common/accelerators/ash_focus_manager_factory.h',

'common/accelerators/debug_commands.cc',

'common/accelerators/debug_commands.h',

'common/accelerators/exit_warning_handler.cc',

« no previous file with comments | « ash/accelerators/focus_manager_factory.cc ('k') | ash/common/accelerators/accelerator_controller.h » ('j') | no next file with comments »