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

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 333c6338a71028ad4c14c4bd71a218eec126a9f5..9b4514bf83c94a5cca2cf808125a53f0e06a9b4d 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' : [
+ ['OS=="win"', {
+ 'sources/': [
+ ['exclude', '_linux\\.cc$'],
+ ],
+ }],
+ ['OS=="mac"', {
+ 'sources/': [
+ ['exclude', '_linux\\.cc$'],
+ ],
+ }]
oshima 2012/01/23 18:06:39 did you need this? I thought _linux.cc is included
pkotwicz 2012/01/23 19:33:02 I think it is necessary. I believe gyp files for m
oshima 2012/01/23 21:40:52 http://code.google.com/codesearch#OAMlx_jo-ck/src/
+ ],
},
{
'target_name': 'aura_shell_unittests',

Powered by Google App Engine
This is Rietveld 408576698