| 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 94b33f14d26725ddbbc10a851d303fa8f17bbc91..9cdc4f5f9e3a33ab2ff4e47f6b0e1e72c6feccff 100644
|
| --- a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
|
| +++ b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
|
| @@ -44,10 +44,11 @@
|
| }],
|
| ['chromevox_compress_js==1', {
|
| 'dependencies': [
|
| - 'chromevox1_content_script',
|
| - 'chromevox1_kbexplorer_script',
|
| - 'chromevox1_options_script',
|
| - 'chromevox2_background_script',
|
| + 'chromevox_content_script',
|
| + 'chromevox_kbexplorer_script',
|
| + 'chromevox_options_script',
|
| + 'chromevox_background_script',
|
| + 'chromevox_panel_script',
|
| ],
|
| }, { # chromevox_compress_js==0
|
| 'dependencies': [
|
| @@ -72,6 +73,7 @@
|
| 'destination': '<(chromevox_dest_dir)/cvox2/background',
|
| 'files': [
|
| 'cvox2/background/background.html',
|
| + 'cvox2/background/panel.html',
|
| ],
|
| },
|
| ],
|
| @@ -134,10 +136,11 @@
|
| 'deps_js_output_file': '<(chromevox_dest_dir)/deps.js',
|
| },
|
| 'sources': [
|
| - '<(chromevox1_content_script_loader_file)',
|
| - '<(chromevox1_kbexplorer_loader_file)',
|
| - '<(chromevox1_options_script_loader_file)',
|
| - '<(chromevox2_background_script_loader_file)',
|
| + '<(chromevox_content_script_loader_file)',
|
| + '<(chromevox_kbexplorer_loader_file)',
|
| + '<(chromevox_options_script_loader_file)',
|
| + '<(chromevox_background_script_loader_file)',
|
| + '<(chromevox_panel_script_loader_file)',
|
| ],
|
| 'includes': ['generate_deps.gypi'],
|
| },
|
| @@ -163,43 +166,52 @@
|
| ['chromevox_compress_js==1', {
|
| 'targets': [
|
| {
|
| - 'target_name': 'chromevox1_content_script',
|
| + 'target_name': 'chromevox_content_script',
|
| 'type': 'none',
|
| 'variables': {
|
| 'output_file': '<(chromevox_dest_dir)/chromeVoxChromePageScript.js',
|
| },
|
| - 'sources': [ '<(chromevox1_content_script_loader_file)' ],
|
| + 'sources': [ '<(chromevox_content_script_loader_file)' ],
|
| 'includes': [ 'compress_js.gypi', ],
|
| },
|
| {
|
| - 'target_name': 'chromevox1_options_script',
|
| + 'target_name': 'chromevox_options_script',
|
| 'type': 'none',
|
| 'variables': {
|
| 'output_file': '<(chromevox_dest_dir)/chromeVoxChromeOptionsScript.js',
|
| },
|
| - 'sources': [ '<(chromevox1_options_script_loader_file)' ],
|
| + 'sources': [ '<(chromevox_options_script_loader_file)' ],
|
| 'includes': [ 'compress_js.gypi', ],
|
| },
|
| {
|
| - 'target_name': 'chromevox1_kbexplorer_script',
|
| + 'target_name': 'chromevox_kbexplorer_script',
|
| 'type': 'none',
|
| 'variables': {
|
| 'output_file': '<(chromevox_dest_dir)/chromeVoxKbExplorerScript.js',
|
| },
|
| - 'sources': [ '<(chromevox1_kbexplorer_loader_file)' ],
|
| + 'sources': [ '<(chromevox_kbexplorer_loader_file)' ],
|
| 'includes': [ 'compress_js.gypi', ],
|
| },
|
| {
|
| - 'target_name': 'chromevox2_background_script',
|
| + 'target_name': 'chromevox_background_script',
|
| 'type': 'none',
|
| 'variables': {
|
| 'output_file': '<(chromevox_dest_dir)/chromeVox2ChromeBackgroundScript.js',
|
| },
|
| 'sources': [
|
| - '<(chromevox2_background_script_loader_file)',
|
| + '<(chromevox_background_script_loader_file)',
|
| ],
|
| 'includes': [ 'compress_js.gypi', ],
|
| },
|
| + {
|
| + 'target_name': 'chromevox_panel_script',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'output_file': '<(chromevox_dest_dir)/chromeVoxPanelScript.js',
|
| + },
|
| + 'sources': [ '<(chromevox_panel_script_loader_file)' ],
|
| + 'includes': [ 'compress_js.gypi', ],
|
| + },
|
| ],
|
| }, { # chromevox_compress_js==0
|
| 'targets': [
|
| @@ -210,10 +222,11 @@
|
| 'dest_dir': '<(chromevox_dest_dir)',
|
| },
|
| 'sources': [
|
| - '<(chromevox1_content_script_loader_file)',
|
| - '<(chromevox1_kbexplorer_loader_file)',
|
| - '<(chromevox1_options_script_loader_file)',
|
| - '<(chromevox2_background_script_loader_file)',
|
| + '<(chromevox_content_script_loader_file)',
|
| + '<(chromevox_kbexplorer_loader_file)',
|
| + '<(chromevox_options_script_loader_file)',
|
| + '<(chromevox_background_script_loader_file)',
|
| + '<(chromevox_panel_script_loader_file)',
|
| ],
|
| 'includes': [ 'copy_js.gypi', ],
|
| },
|
|
|