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

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: Changes as requested Created 8 years, 10 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 18 matching lines...) Expand all
29 '../ui/ui.gyp:ui_resources_standard', 29 '../ui/ui.gyp:ui_resources_standard',
30 '../ui/views/views.gyp:views', 30 '../ui/views/views.gyp:views',
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_dispatcher.cc',
40 'accelerators/accelerator_dispatcher.h',
41 'accelerators/accelerator_dispatcher_linux.cc',
42 'accelerators/accelerator_dispatcher_win.cc',
39 'accelerators/accelerator_filter.cc', 43 'accelerators/accelerator_filter.cc',
40 'accelerators/accelerator_filter.h', 44 'accelerators/accelerator_filter.h',
45 'accelerators/nested_dispatcher_controller.cc',
46 'accelerators/nested_dispatcher_controller.h',
41 'app_list/app_list.cc', 47 'app_list/app_list.cc',
42 'app_list/app_list.h', 48 'app_list/app_list.h',
43 'app_list/app_list_groups_view.cc', 49 'app_list/app_list_groups_view.cc',
44 'app_list/app_list_groups_view.h', 50 'app_list/app_list_groups_view.h',
45 'app_list/app_list_item_group_model.cc', 51 'app_list/app_list_item_group_model.cc',
46 'app_list/app_list_item_group_model.h', 52 'app_list/app_list_item_group_model.h',
47 'app_list/app_list_item_group_view.cc', 53 'app_list/app_list_item_group_view.cc',
48 'app_list/app_list_item_group_view.h', 54 'app_list/app_list_item_group_view.h',
49 'app_list/app_list_item_model.cc', 55 'app_list/app_list_item_model.cc',
50 'app_list/app_list_item_model.h', 56 'app_list/app_list_item_model.h',
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 'shell/cocoa/app-Info.plist', 321 'shell/cocoa/app-Info.plist',
316 ], 322 ],
317 'xcode_settings': { 323 'xcode_settings': {
318 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 324 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
319 }, 325 },
320 }], 326 }],
321 ], 327 ],
322 }, 328 },
323 ], 329 ],
324 } 330 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698