Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 'variables': { | 5 'variables': { |
| 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', | 7 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', |
| 8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', | 8 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/i nternal/additional_modules_list.txt', |
| 9 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js', | 9 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/om nibox/omnibox.mojom.js', |
| 10 }, | 10 }, |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 { | 104 { |
| 105 # GN version: //chrome/browser/resources:extension_resource_demo | 105 # GN version: //chrome/browser/resources:extension_resource_demo |
| 106 'destination': '<(PRODUCT_DIR)/resources/extension/demo', | 106 'destination': '<(PRODUCT_DIR)/resources/extension/demo', |
| 107 'files': [ | 107 'files': [ |
| 108 'browser/resources/extension_resource/demo/library.js', | 108 'browser/resources/extension_resource/demo/library.js', |
| 109 ], | 109 ], |
| 110 }, | 110 }, |
| 111 ], | 111 ], |
| 112 }], | 112 }], |
| 113 ['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', { | 113 ['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', { |
| 114 'conditions': [ | 114 'dependencies': [ |
| 115 # TODO(dtseng): Remove use_chromevox_next once ChromeVox Next is rea dy for testing. | 115 'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', |
| 116 ['use_chromevox_next==1', { | 116 'browser/resources/chromeos/chromevox2/chromevox.gyp:chromevox2', |
|
Peter Lundblad
2014/09/22 09:00:46
OK, so the intention is to not have a build flag a
David Tseng
2014/09/22 15:51:46
This comment will probably answer the other questi
| |
| 117 'dependencies': [ | |
| 118 'browser/resources/chromeos/chromevox2/chromevox.gyp:chromevox2' , | |
| 119 ], | |
| 120 }, { # else use_chromevox_next == 0 | |
| 121 'dependencies': [ | |
| 122 'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', | |
| 123 ], | |
| 124 }], | |
| 125 ], | 117 ], |
| 126 }], | 118 }], |
| 127 ['enable_extensions==1', { | 119 ['enable_extensions==1', { |
| 128 'actions': [ | 120 'actions': [ |
| 129 { | 121 { |
| 130 # GN version: //chrome/browser/resources:quota_internals_resources | 122 # GN version: //chrome/browser/resources:quota_internals_resources |
| 131 'action_name': 'generate_quota_internals_resources', | 123 'action_name': 'generate_quota_internals_resources', |
| 132 'variables': { | 124 'variables': { |
| 133 'grit_grd_file': 'browser/resources/quota_internals_resources.gr d', | 125 'grit_grd_file': 'browser/resources/quota_internals_resources.gr d', |
| 134 }, | 126 }, |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 576 '<(generator_path)', | 568 '<(generator_path)', |
| 577 'credits', | 569 'credits', |
| 578 '<(about_credits_file)', | 570 '<(about_credits_file)', |
| 579 ], | 571 ], |
| 580 'message': 'Generating about:credits', | 572 'message': 'Generating about:credits', |
| 581 }, | 573 }, |
| 582 ], | 574 ], |
| 583 }, | 575 }, |
| 584 ], # targets | 576 ], # targets |
| 585 } | 577 } |
| OLD | NEW |