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

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: Updated accelerator_action.h Created 8 years, 4 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/views/views.gyp:views', 35 '../ui/views/views.gyp:views',
36 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 36 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 ], 576 ],
576 'conditions': [ 577 'conditions': [
577 ['OS=="win"', { 578 ['OS=="win"', {
578 'msvs_settings': { 579 'msvs_settings': {
579 'VCLinkerTool': { 580 'VCLinkerTool': {
580 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 581 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
581 }, 582 },
582 }, 583 },
583 'dependencies': [ 584 'dependencies': [
584 '../sandbox/sandbox.gyp:sandbox', 585 '../sandbox/sandbox.gyp:sandbox',
585 ], 586 ],
586 }], 587 }],
587 ['OS=="mac"', { 588 ['OS=="mac"', {
588 'product_name': 'AuraShell', 589 'product_name': 'AuraShell',
589 'mac_bundle': 1, 590 'mac_bundle': 1,
590 'sources/': [ 591 'sources/': [
591 ['exclude', 'shell/shell_main_parts.cc'], 592 ['exclude', 'shell/shell_main_parts.cc'],
592 ], 593 ],
593 'mac_bundle_resources': [ 594 'mac_bundle_resources': [
594 'shell/cocoa/app.icns', 595 'shell/cocoa/app.icns',
595 'shell/cocoa/app-Info.plist', 596 'shell/cocoa/app-Info.plist',
596 'shell/cocoa/nibs/MainMenu.xib', 597 'shell/cocoa/nibs/MainMenu.xib',
597 'shell/cocoa/nibs/RootWindow.xib', 598 'shell/cocoa/nibs/RootWindow.xib',
598 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', 599 '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
599 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_I NTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', 600 '<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_I NTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
600 ], 601 ],
601 'mac_bundle_resources!': [ 602 'mac_bundle_resources!': [
602 'shell/cocoa/app-Info.plist', 603 'shell/cocoa/app-Info.plist',
603 ], 604 ],
604 'xcode_settings': { 605 'xcode_settings': {
605 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 606 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
606 }, 607 },
607 }], 608 }],
608 ], 609 ],
609 }, 610 },
610 ], 611 ],
611 } 612 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698