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

Unified Diff: ash/ash.gyp

Issue 9224001: Fixes issue with accelerators when a menu is open (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nicer diff Created 8 years, 11 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 68931fe2f1c47a878317b3fdd7be2383374861cf..d80dc81bf1f6b977097e8b1aa13b05c867505b1c 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -38,6 +38,9 @@
'accelerators/accelerator_controller.h',
'accelerators/accelerator_filter.cc',
'accelerators/accelerator_filter.h',
+ 'accelerators/accelerator_handler.cc',
+ 'accelerators/accelerator_handler.h',
+ 'accelerators/accelerator_handler_linux.cc',
'app_list/app_list.cc',
'app_list/app_list.h',
'app_list/app_list_groups_view.cc',
@@ -176,6 +179,18 @@
'wm/workspace/workspace_manager.h',
'wm/workspace/workspace_observer.h',
],
+ 'conditions' : [
sky 2012/01/23 23:14:35 Aren't these rules defined in common.gypi.
+ ['OS=="win"', {
+ 'sources/': [
+ ['exclude', '_linux\\.cc$'],
+ ],
+ }],
+ ['OS=="mac"', {
+ 'sources/': [
+ ['exclude', '_linux\\.cc$'],
+ ],
+ }]
+ ],
},
{
'target_name': 'aura_shell_unittests',

Powered by Google App Engine
This is Rietveld 408576698