Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / api / schemas.gypi

diff --git a/src/chrome/common/extensions/api/schemas.gypi b/src/chrome/common/extensions/api/schemas.gypi
index 42a08f6..27e968b 100644 (file)
--- a/src/chrome/common/extensions/api/schemas.gypi
+++ b/src/chrome/common/extensions/api/schemas.gypi
@@ -29,8 +29,10 @@
       'copresence.idl',
       'copresence_private.idl',
       'debugger.json',
+      'desktop_capture.json',
       'developer_private.idl',
       'dial.idl',
+      'document_scan.idl',
       'downloads.idl',
       'downloads_internal.idl',
       'easy_unlock_private.idl',
@@ -56,7 +58,6 @@
       'image_writer_private.idl',
       'input_ime.json',
       'location.idl',
-      'management.json',
       'manifest_types.json',
       'mdns.idl',
       'media_galleries.idl',
@@ -69,18 +70,21 @@
       'page_capture.json',
       'permissions.json',
       'preferences_private.json',
+      'printer_provider.idl',
       'push_messaging.idl',
       'reading_list_private.json',
       'screenlock_private.idl',
+      'sessions.json',
       'signed_in_devices.idl',
       'streams_private.idl',
       'synced_notifications_private.idl',
       'sync_file_system.idl',
       'system_indicator.idl',
       'system_private.json',
+      'tab_capture.idl',
+      'tabs.json',
       'terminal_private.json',
       'types.json',
-      'virtual_keyboard_private.json',
       'web_navigation.json',
       # Despite the name, this API does not rely on any
       # WebRTC-specific bits and as such does not belong in
@@ -88,6 +92,7 @@
       'webrtc_audio_private.idl',
       'webrtc_logging_private.idl',
       'webstore_private.json',
+      'windows.json',
     ],
     'main_schema_include_rules': [
       'extensions/common/api:extensions::core_api::%(namespace)s',
@@ -103,15 +108,7 @@
       'principals_private.idl',
       'top_sites.json',
     ],
-    # APIs that are causing crashes on athena.
-    # TODO(oshima): Fix crashes and add them back. crbug.com/414340.
-    'non_athena_schema_files': [
-      'desktop_capture.json',
-      'sessions.json',
-      'tab_capture.idl',
-      'tabs.json',
-      'windows.json',
-    ],
+
     # ChromeOS-specific schemas.
     'chromeos_schema_files': [
       'accessibility_features.json',
@@ -121,9 +118,12 @@
       'file_browser_handler_internal.json',
       'first_run_private.json',
       'log_private.idl',
+    ],
+
+    # ChromeOS-specific schemas which have not been ported to Athena.
+    'chromeos_non_athena_schema_files': [
       'wallpaper.json',
       'wallpaper_private.json',
-      'webcam_private.idl',
     ],
 
     'webrtc_schema_files': [
@@ -132,45 +132,36 @@
       'cast_streaming_udp_transport.idl',
     ],
 
+    'non_compiled_schema_files': [
+      '<@(main_non_compiled_schema_files)',
+    ],
+    'schema_dependencies': [
+      '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
+    ],
+    'schema_files': [
+      '<@(main_schema_files)',
+    ],
+    'schema_include_rules': [
+      '<@(main_schema_include_rules)',
+    ],
+
     'chromium_code': 1,
     # Disable schema compiler to generate model extension API code.
     # Only register the extension functions in extension system.
     'conditions': [
-      # TODO(thestig): Remove this file from non-extensions build so the
-      # conditional and else branch goes away.
-      # Do the same for chrome/common/extensions/api/schemas.gni.
-      ['enable_extensions==1', {
-        'non_compiled_schema_files': [
-          '<@(main_non_compiled_schema_files)',
-        ],
-        'schema_dependencies': [
-          '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
-        ],
-        'schema_files': [
-          '<@(main_schema_files)',
-        ],
-        'schema_include_rules': [
-          '<@(main_schema_include_rules)',
-        ],
-      }, {  # enable_extensions==0
-        'non_compiled_schema_files': [
-        ],
-        'schema_dependencies': [
-        ],
-        'schema_files': [
-        ],
-      }],
       ['chromeos==1', {
         'schema_files': [
           '<@(chromeos_schema_files)',
         ],
-      }],
-      ['use_athena==0', {
-        'schema_files': [
-          '<@(non_athena_schema_files)',
+        'conditions': [
+          ['use_athena==0', {
+            'schema_files': [
+              '<@(chromeos_non_athena_schema_files)',
+            ],
+          }],
         ],
       }],
-      ['enable_extensions==1 and enable_webrtc==1', {
+      ['enable_webrtc==1', {
         'schema_files': [
           '<@(webrtc_schema_files)',
         ],