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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/chromeos/chromevox/chromevox.gyp

Issue 656813002: Support running ChromeVox in uncompressed mode and compress ChromeVox next by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Move copied_scripts into a condition. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js » ('j') | chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/chromevox/chromevox.gyp
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
index 845e5e2afb6ea07a230c04ed1d1e788ffcbf6cb2..248a9dc48adaf8953f80d2142a6c24eefef571ec 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
@@ -8,10 +8,12 @@
'variables': {
# Whether to compress the 4 main ChromeVox scripts.
'chromevox_compress_js%': '1',
- 'background_script_loader_file': 'chromevox/background/loader.js',
- 'content_script_loader_file': 'chromevox/injected/loader.js',
- 'options_script_loader_file': 'chromevox/background/options_loader.js',
- 'kbexplorer_loader_file': 'chromevox/background/kbexplorer_loader.js',
+ 'chromevox1_background_script_loader_file': 'chromevox/background/loader.js',
+ 'chromevox1_content_script_loader_file': 'chromevox/injected/loader.js',
+ 'chromevox1_options_script_loader_file': 'chromevox/background/options_loader.js',
+ 'chromevox1_kbexplorer_loader_file': 'chromevox/background/kbexplorer_loader.js',
+ 'chromevox2_background_script_loader_file': 'cvox2/background/loader.js',
David Tseng 2014/10/14 23:10:11 nit: sort
+
},
'includes': [
'chromevox_tests.gypi',
@@ -23,9 +25,10 @@
'type': 'none',
'dependencies': [
'chromevox_resources',
- 'chromevox_manifest',
- 'chromevox_guest_manifest',
- 'chromevox2',
+ 'chromevox1_manifest',
+ 'chromevox1_guest_manifest',
+ 'chromevox2_manifest',
+ 'chromevox2_guest_manifest',
],
},
{
@@ -47,15 +50,16 @@
}],
['chromevox_compress_js==1', {
'dependencies': [
- 'chromevox_content_script',
- 'chromevox_background_script',
- 'chromevox_options_script',
- 'chromevox_kbexplorer_script',
+ 'chromevox1_content_script',
+ 'chromevox1_background_script',
+ 'chromevox1_options_script',
David Tseng 2014/10/14 23:10:11 nit: sort
+ 'chromevox1_kbexplorer_script',
+ 'chromevox2_background_script',
],
- }],
- ['chromevox_compress_js==0', {
+ }, {
'dependencies': [
David Tseng 2014/10/14 23:10:10 # else chromevox_compress_js==0
'chromevox_copied_scripts',
+ 'chromevox_deps',
],
}],
],
@@ -68,23 +72,6 @@
],
},
{
- 'target_name': 'chromevox_manifest',
- 'type': 'none',
- 'variables': {
- 'output_manifest_path': '<(chromevox_dest_dir)/manifest.json',
- },
- 'includes': [ 'generate_manifest.gypi', ],
- },
- {
- 'target_name': 'chromevox_guest_manifest',
- 'type': 'none',
- 'variables': {
- 'output_manifest_path': '<(chromevox_dest_dir)/manifest_guest.json',
- 'is_guest_manifest': 1,
- },
- 'includes': [ 'generate_manifest.gypi', ],
- },
- {
'target_name': 'chromevox_static_files',
'type': 'none',
'copies': [
@@ -96,6 +83,12 @@
'chromevox/background/options.html',
],
},
+ {
+ 'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/cvox2/background',
+ 'files': [
+ 'cvox2/background/background.html',
+ ],
+ },
],
},
{
@@ -105,19 +98,31 @@
'type': 'none',
'copies': [
{
- 'destination': '<(chromevox_dest_dir)/closure',
- 'files': [
- 'closure/closure_preinit.js',
- ],
- },
- {
'destination': '<(chromevox_dest_dir)/chromevox/injected',
'files': [
'chromevox/injected/api.js',
- 'chromevox/injected/api_util.js',
+ ],
+ 'conditions': [
David Tseng 2014/10/14 23:10:10 What happened to api_util.js above? It should alwa
+ [ 'chromevox_compress_js==1', {
+ 'files': [
+ 'chromevox/injected/api_util.js',
+ ],
+ }],
],
},
],
+ 'conditions': [
+ [ 'chromevox_compress_js==0', {
+ 'copies': [
+ {
+ 'destination': '<(chromevox_dest_dir)/closure',
+ 'files': [
+ 'closure/closure_preinit.js',
+ ],
+ },
+ ],
+ }],
+ ],
},
{
'target_name': 'chromevox_strings',
@@ -136,56 +141,43 @@
],
},
{
- 'target_name': 'chromevox2',
- 'type': 'none',
- 'dependencies': [
- 'chromevox2_copied_scripts',
- 'chromevox2_deps',
- 'chromevox2_manifest',
- 'chromevox2_guest_manifest',
- 'chromevox2_resources',
- ],
- },
- {
- 'target_name': 'chromevox2_copied_scripts',
+ 'target_name': 'chromevox_deps',
'type': 'none',
'variables': {
- 'dest_dir': '<(chromevox_dest_dir)',
+ 'deps_js_output_file': '<(chromevox_dest_dir)/deps.js',
},
'sources': [
- 'cvox2/background/loader.js',
+ '<(chromevox1_background_script_loader_file)',
+ '<(chromevox1_content_script_loader_file)',
+ '<(chromevox1_options_script_loader_file)',
+ '<(chromevox1_kbexplorer_loader_file)',
+ '<(chromevox2_background_script_loader_file)',
David Tseng 2014/10/14 23:10:11 nit: sort
],
- 'includes': [ 'copy_js.gypi', ],
+ 'includes': ['generate_deps.gypi'],
},
{
- 'target_name': 'chromevox2_deps',
+ 'target_name': 'chromevox1_manifest',
'type': 'none',
'variables': {
- 'deps_js_output_file': '<(chromevox_dest_dir)/deps.js',
+ 'output_manifest_path': '<(chromevox_dest_dir)/manifest.json',
},
- 'sources': [
- 'cvox2/background/loader.js',
- ],
- 'includes': ['generate_deps.gypi'],
+ 'includes': [ 'generate_manifest.gypi', ],
},
{
- 'target_name': 'chromevox2_resources',
+ 'target_name': 'chromevox1_guest_manifest',
'type': 'none',
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/cvox2/background',
- 'files': [
- 'cvox2/background/background.html',
- ],
- },
- ],
+ 'variables': {
+ 'output_manifest_path': '<(chromevox_dest_dir)/manifest_guest.json',
+ 'is_guest_manifest': 1,
+ },
+ 'includes': [ 'generate_manifest.gypi', ],
},
{
'target_name': 'chromevox2_manifest',
'type': 'none',
'variables': {
'output_manifest_path': '<(chromevox_dest_dir)/manifest_next.json',
- 'use_chromevox_next': 1,
+ 'is_chromevox_next': 1,
},
'includes': [ 'generate_manifest.gypi', ],
},
@@ -195,7 +187,7 @@
'variables': {
'output_manifest_path': '<(chromevox_dest_dir)/manifest_next_guest.json',
'is_guest_manifest': 1,
- 'use_chromevox_next': 1,
+ 'is_chromevox_next': 1,
},
'includes': [ 'generate_manifest.gypi', ],
},
@@ -204,45 +196,55 @@
['chromevox_compress_js==1', {
'targets': [
{
- 'target_name': 'chromevox_content_script',
+ 'target_name': 'chromevox1_content_script',
'type': 'none',
'variables': {
'output_file': '<(chromevox_dest_dir)/chromeVoxChromePageScript.js',
},
- 'sources': [ '<(content_script_loader_file)' ],
+ 'sources': [ '<(chromevox1_content_script_loader_file)' ],
'includes': [ 'compress_js.gypi', ],
},
{
- 'target_name': 'chromevox_background_script',
+ 'target_name': 'chromevox1_background_script',
'type': 'none',
'variables': {
'output_file': '<(chromevox_dest_dir)/chromeVoxChromeBackgroundScript.js',
},
- 'sources': [ '<(background_script_loader_file)' ],
+ 'sources': [ '<(chromevox1_background_script_loader_file)' ],
'includes': [ 'compress_js.gypi', ],
},
{
- 'target_name': 'chromevox_options_script',
+ 'target_name': 'chromevox1_options_script',
'type': 'none',
'variables': {
'output_file': '<(chromevox_dest_dir)/chromeVoxChromeOptionsScript.js',
},
- 'sources': [ '<(options_script_loader_file)' ],
+ 'sources': [ '<(chromevox1_options_script_loader_file)' ],
'includes': [ 'compress_js.gypi', ],
},
{
- 'target_name': 'chromevox_kbexplorer_script',
+ 'target_name': 'chromevox1_kbexplorer_script',
'type': 'none',
'variables': {
'output_file': '<(chromevox_dest_dir)/chromeVoxKbExplorerScript.js',
},
- 'sources': [ '<(kbexplorer_loader_file)' ],
+ 'sources': [ '<(chromevox1_kbexplorer_loader_file)' ],
+ 'includes': [ 'compress_js.gypi', ],
+ },
+ {
+ 'target_name': 'chromevox2_background_script',
+ 'type': 'none',
+ 'variables': {
+ 'output_file': '<(chromevox_dest_dir)/chromeVox2ChromeBackgroundScript.js',
+ },
+ 'sources': [
+ '<(chromevox1_background_script_loader_file)',
+ '<(chromevox2_background_script_loader_file)',
+ ],
'includes': [ 'compress_js.gypi', ],
},
],
- },
- ],
- ['chromevox_compress_js==0', {
+ }, {
'targets': [
David Tseng 2014/10/14 23:10:10 nit: # else chromevox_compress_js==0
{
'target_name': 'chromevox_copied_scripts',
@@ -251,10 +253,11 @@
'dest_dir': '<(chromevox_dest_dir)',
},
'sources': [
- '<(background_script_loader_file)',
- '<(content_script_loader_file)',
- '<(kbexplorer_loader_file)',
- '<(options_script_loader_file)',
+ '<(chromevox1_background_script_loader_file)',
+ '<(chromevox1_content_script_loader_file)',
+ '<(chromevox1_kbexplorer_loader_file)',
+ '<(chromevox1_options_script_loader_file)',
+ '<(chromevox2_background_script_loader_file)',
],
'includes': [ 'copy_js.gypi', ],
},
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js » ('j') | chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698