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

Side by Side Diff: ash/ash.gyp

Issue 10784009: screenshot disabling policy tests (Closed) Base URL: http://git.chromium.org/chromium/src.git@disable_screenshots
Patch Set: accelerator_table.h, renamed ApplyAshAccelerator, addressed comments (2) Created 8 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 unified diff | Download patch
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 22 matching lines...) Expand all
33 '../ui/ui.gyp:ui', 33 '../ui/ui.gyp:ui',
34 '../ui/ui.gyp:ui_resources', 34 '../ui/ui.gyp:ui_resources',
35 '../ui/ui.gyp:ui_resources_standard', 35 '../ui/ui.gyp:ui_resources_standard',
36 '../ui/views/views.gyp:views', 36 '../ui/views/views.gyp:views',
37 ], 37 ],
38 'defines': [ 38 'defines': [
39 'ASH_IMPLEMENTATION', 39 'ASH_IMPLEMENTATION',
40 ], 40 ],
41 'sources': [ 41 'sources': [
42 # All .cc, .h under ash, except unittests 42 # All .cc, .h under ash, except unittests
43 'accelerators/accelerator_action.h',
43 'accelerators/accelerator_controller.cc', 44 'accelerators/accelerator_controller.cc',
44 'accelerators/accelerator_controller.h', 45 'accelerators/accelerator_controller.h',
45 'accelerators/accelerator_dispatcher.cc', 46 'accelerators/accelerator_dispatcher.cc',
46 'accelerators/accelerator_dispatcher.h', 47 'accelerators/accelerator_dispatcher.h',
47 'accelerators/accelerator_filter.cc', 48 'accelerators/accelerator_filter.cc',
48 'accelerators/accelerator_filter.h', 49 'accelerators/accelerator_filter.h',
49 'accelerators/accelerator_table.cc', 50 'accelerators/accelerator_table.cc',
50 'accelerators/accelerator_table.h', 51 'accelerators/accelerator_table.h',
51 'accelerators/focus_manager_factory.cc', 52 'accelerators/focus_manager_factory.cc',
52 'accelerators/focus_manager_factory.h', 53 'accelerators/focus_manager_factory.h',
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 ], 542 ],
542 'conditions': [ 543 'conditions': [
543 ['OS=="win"', { 544 ['OS=="win"', {
544 'msvs_settings': { 545 'msvs_settings': {
545 'VCLinkerTool': { 546 'VCLinkerTool': {
546 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 547 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
547 }, 548 },
548 }, 549 },
549 'dependencies': [ 550 'dependencies': [
550 '../sandbox/sandbox.gyp:sandbox', 551 '../sandbox/sandbox.gyp:sandbox',
551 ], 552 ],
552 }], 553 }],
553 ['OS=="mac"', { 554 ['OS=="mac"', {
554 'product_name': 'AuraShell', 555 'product_name': 'AuraShell',
555 'mac_bundle': 1, 556 'mac_bundle': 1,
556 'sources/': [ 557 'sources/': [
557 ['exclude', 'shell/shell_main_parts.cc'], 558 ['exclude', 'shell/shell_main_parts.cc'],
558 ], 559 ],
559 'mac_bundle_resources': [ 560 'mac_bundle_resources': [
560 'shell/cocoa/app.icns', 561 'shell/cocoa/app.icns',
561 'shell/cocoa/app-Info.plist', 562 'shell/cocoa/app-Info.plist',
562 'shell/cocoa/nibs/MainMenu.xib', 563 'shell/cocoa/nibs/MainMenu.xib',
563 'shell/cocoa/nibs/RootWindow.xib', 564 'shell/cocoa/nibs/RootWindow.xib',
564 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', 565 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
565 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_I NTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', 566 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_I NTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
566 ], 567 ],
567 'mac_bundle_resources!': [ 568 'mac_bundle_resources!': [
568 'shell/cocoa/app-Info.plist', 569 'shell/cocoa/app-Info.plist',
569 ], 570 ],
570 'xcode_settings': { 571 'xcode_settings': {
571 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 572 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
572 }, 573 },
573 }], 574 }],
574 ], 575 ],
575 }, 576 },
576 ], 577 ],
577 } 578 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698