Chromium Code Reviews| Index: chrome/chrome_resources.gyp |
| diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp |
| index d2a04e14b38ad7a4ab29ee8430a6e5e7ff96c118..ac4e98a43601a498cc484a977a3b19b646ff8846 100644 |
| --- a/chrome/chrome_resources.gyp |
| +++ b/chrome/chrome_resources.gyp |
| @@ -111,17 +111,9 @@ |
| ], |
| }], |
| ['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', { |
| - 'conditions': [ |
| - # TODO(dtseng): Remove use_chromevox_next once ChromeVox Next is ready for testing. |
| - ['use_chromevox_next==1', { |
| - 'dependencies': [ |
| - 'browser/resources/chromeos/chromevox2/chromevox.gyp:chromevox2', |
| - ], |
| - }, { # else use_chromevox_next == 0 |
| - 'dependencies': [ |
| - 'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', |
| - ], |
| - }], |
| + 'dependencies': [ |
| + 'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox', |
| + '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
|
| ], |
| }], |
| ['enable_extensions==1', { |