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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 10
(...skipping 20 matching lines...) Expand all
31 ], 31 ],
32 'defines': [ 32 'defines': [
33 'ASH_IMPLEMENTATION', 33 'ASH_IMPLEMENTATION',
34 ], 34 ],
35 'sources': [ 35 'sources': [
36 # All .cc, .h under ash, except unittests 36 # All .cc, .h under ash, except unittests
37 'accelerators/accelerator_controller.cc', 37 'accelerators/accelerator_controller.cc',
38 'accelerators/accelerator_controller.h', 38 'accelerators/accelerator_controller.h',
39 'accelerators/accelerator_filter.cc', 39 'accelerators/accelerator_filter.cc',
40 'accelerators/accelerator_filter.h', 40 'accelerators/accelerator_filter.h',
41 'accelerators/accelerator_handler.cc',
42 'accelerators/accelerator_handler.h',
43 'accelerators/accelerator_handler_linux.cc',
41 'app_list/app_list.cc', 44 'app_list/app_list.cc',
42 'app_list/app_list.h', 45 'app_list/app_list.h',
43 'app_list/app_list_groups_view.cc', 46 'app_list/app_list_groups_view.cc',
44 'app_list/app_list_groups_view.h', 47 'app_list/app_list_groups_view.h',
45 'app_list/app_list_item_group_model.cc', 48 'app_list/app_list_item_group_model.cc',
46 'app_list/app_list_item_group_model.h', 49 'app_list/app_list_item_group_model.h',
47 'app_list/app_list_item_group_view.cc', 50 'app_list/app_list_item_group_view.cc',
48 'app_list/app_list_item_group_view.h', 51 'app_list/app_list_item_group_view.h',
49 'app_list/app_list_item_model.cc', 52 'app_list/app_list_item_model.cc',
50 'app_list/app_list_item_model.h', 53 'app_list/app_list_item_model.h',
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 'wm/window_util.cc', 172 'wm/window_util.cc',
170 'wm/window_util.h', 173 'wm/window_util.h',
171 'wm/workspace_controller.cc', 174 'wm/workspace_controller.cc',
172 'wm/workspace_controller.h', 175 'wm/workspace_controller.h',
173 'wm/workspace/workspace.cc', 176 'wm/workspace/workspace.cc',
174 'wm/workspace/workspace.h', 177 'wm/workspace/workspace.h',
175 'wm/workspace/workspace_manager.cc', 178 'wm/workspace/workspace_manager.cc',
176 'wm/workspace/workspace_manager.h', 179 'wm/workspace/workspace_manager.h',
177 'wm/workspace/workspace_observer.h', 180 'wm/workspace/workspace_observer.h',
178 ], 181 ],
182 'conditions' : [
183 ['OS=="win"', {
184 'sources/': [
185 ['exclude', '_linux\\.cc$'],
186 ],
187 }],
188 ['OS=="mac"', {
189 'sources/': [
190 ['exclude', '_linux\\.cc$'],
191 ],
192 }]
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/
193 ],
179 }, 194 },
180 { 195 {
181 'target_name': 'aura_shell_unittests', 196 'target_name': 'aura_shell_unittests',
182 'type': 'executable', 197 'type': 'executable',
183 'dependencies': [ 198 'dependencies': [
184 '../base/base.gyp:base', 199 '../base/base.gyp:base',
185 '../base/base.gyp:test_support_base', 200 '../base/base.gyp:test_support_base',
186 '../chrome/chrome_resources.gyp:packed_resources', 201 '../chrome/chrome_resources.gyp:packed_resources',
187 '../build/temp_gyp/googleurl.gyp:googleurl', 202 '../build/temp_gyp/googleurl.gyp:googleurl',
188 '../skia/skia.gyp:skia', 203 '../skia/skia.gyp:skia',
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 'shell/cocoa/app-Info.plist', 333 'shell/cocoa/app-Info.plist',
319 ], 334 ],
320 'xcode_settings': { 335 'xcode_settings': {
321 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 336 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
322 }, 337 },
323 }], 338 }],
324 ], 339 ],
325 }, 340 },
326 ], 341 ],
327 } 342 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698