Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / chromeos / chromevox / chromevox.gyp

diff --git a/src/chrome/browser/resources/chromeos/chromevox/chromevox.gyp b/src/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
index 6355356..760675f 100644 (file)
--- a/src/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
+++ b/src/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
@@ -6,13 +6,13 @@
   'conditions': [
     ['chromeos==1', {
       'variables': {
-        # Whether to compress the 4 main ChromeVox scripts.  Applicable if
-        # use_migrated_chromevox is true.
+        # 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_kbexplorer_loader_file': 'chromevox/background/kbexplorer_loader.js',
+        'chromevox1_options_script_loader_file': 'chromevox/background/options_loader.js',
+        'chromevox2_background_script_loader_file': 'cvox2/background/loader.js',
       },
       'includes': [
         'chromevox_tests.gypi',
@@ -24,8 +24,10 @@
           'type': 'none',
           'dependencies': [
             'chromevox_resources',
-            'chromevox_manifest',
-            'chromevox_guest_manifest',
+            'chromevox1_manifest',
+            'chromevox1_guest_manifest',
+            'chromevox2_manifest',
+            'chromevox2_guest_manifest',
           ],
         },
         {
@@ -45,17 +47,18 @@
                 '<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapper_nacl',
               ],
             }],
-            ['use_migrated_chromevox==1 and chromevox_compress_js==1', {
+            ['chromevox_compress_js==1', {
               'dependencies': [
-                'chromevox_content_script',
-                'chromevox_background_script',
-                'chromevox_options_script',
-                'chromevox_kbexplorer_script',
+                'chromevox1_background_script',
+                'chromevox1_content_script',
+                'chromevox1_kbexplorer_script',
+                'chromevox1_options_script',
+                'chromevox2_background_script',
               ],
-            }],
-            ['use_migrated_chromevox==1 and chromevox_compress_js==0', {
+            }, {  # chromevox_compress_js==0
               'dependencies': [
                 'chromevox_copied_scripts',
+                'chromevox_deps',
               ],
             }],
           ],
@@ -68,23 +71,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 +82,12 @@
                 'chromevox/background/options.html',
               ],
             },
+            {
+              'destination': '<(PRODUCT_DIR)/resources/chromeos/chromevox/cvox2/background',
+              'files': [
+                'cvox2/background/background.html',
+              ],
+            },
           ],
         },
         {
@@ -105,24 +97,33 @@
           'type': 'none',
           'copies': [
             {
-              'destination': '<(chromevox_dest_dir)/closure',
+              'destination': '<(chromevox_dest_dir)/chromevox/injected',
               'files': [
-                'closure/closure_preinit.js',
+                'chromevox/injected/api.js',
               ],
               'conditions': [
-                ['use_migrated_chromevox==0 or chromevox_compress_js==1', {
-                  'files': [ '<(closure_goog_dir)/base.js' ],
+                [ 'chromevox_compress_js==1', {
+                  'files': [
+                    # api_util.js is copied by the chromevox_copied_scripts
+                    # target in the non-compressed case.
+                    'chromevox/injected/api_util.js',
+                  ],
                 }],
-              ]
-            },
-            {
-              'destination': '<(chromevox_dest_dir)/chromevox/injected',
-              'files': [
-                'chromevox/injected/api.js',
-                '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',
@@ -140,50 +141,111 @@
             },
           ],
         },
+        {
+          'target_name': 'chromevox_deps',
+          'type': 'none',
+          'variables': {
+            'deps_js_output_file': '<(chromevox_dest_dir)/deps.js',
+          },
+          'sources': [
+            '<(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': ['generate_deps.gypi'],
+        },
+        {
+          'target_name': 'chromevox1_manifest',
+          'type': 'none',
+          'variables': {
+            'output_manifest_path': '<(chromevox_dest_dir)/manifest.json',
+          },
+          'includes': [ 'generate_manifest.gypi', ],
+        },
+        {
+          'target_name': 'chromevox1_guest_manifest',
+          'type': 'none',
+          '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',
+            'is_chromevox_next': 1,
+          },
+          'includes': [ 'generate_manifest.gypi', ],
+        },
+        {
+          'target_name': 'chromevox2_guest_manifest',
+          'type': 'none',
+          'variables': {
+            'output_manifest_path': '<(chromevox_dest_dir)/manifest_next_guest.json',
+            'is_guest_manifest': 1,
+            'is_chromevox_next': 1,
+          },
+          'includes': [ 'generate_manifest.gypi', ],
+        },
       ],
       'conditions': [
-        ['use_migrated_chromevox==1 and chromevox_compress_js==1', {
+        ['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', ],
             },
           ],
-        },
-        ],
-        ['use_migrated_chromevox==1 and chromevox_compress_js==0', {
+        }, {  # chromevox_compress_js==0
           'targets': [
             {
               'target_name': 'chromevox_copied_scripts',
@@ -192,10 +254,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', ],
             },