Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / chrome.gyp

diff --git a/src/chrome/chrome.gyp b/src/chrome/chrome.gyp
index ed83b62..1900034 100644 (file)
--- a/src/chrome/chrome.gyp
+++ b/src/chrome/chrome.gyp
@@ -168,6 +168,8 @@
             'browser/devtools/browser_list_tabcontents_provider.h',
             'browser/devtools/devtools_adb_bridge.cc',
             'browser/devtools/devtools_adb_bridge.h',
+            'browser/devtools/devtools_contents_resizing_strategy.cc',
+            'browser/devtools/devtools_contents_resizing_strategy.h',
             'browser/devtools/devtools_embedder_message_dispatcher.cc',
             'browser/devtools/devtools_embedder_message_dispatcher.h',
             'browser/devtools/devtools_file_helper.cc',
@@ -255,6 +257,8 @@
           'sources': [
             'utility/chrome_content_utility_client.cc',
             'utility/chrome_content_utility_client.h',
+            'utility/chrome_content_utility_ipc_whitelist.cc',
+            'utility/chrome_content_utility_ipc_whitelist.h',
             'utility/cloud_print/bitmap_image.cc',
             'utility/cloud_print/bitmap_image.h',
             'utility/cloud_print/pwg_encoder.cc',
@@ -638,7 +642,6 @@
             ['component=="shared_library"', {
               'dependencies': [
                 '../content/content.gyp:content_plugin',
-                '../webkit/glue/webkit_glue.gyp:glue',
               ],
               'xcode_settings': {
                 'LD_RUNPATH_SEARCH_PATHS': [
@@ -978,6 +981,7 @@
           'target_name': 'chrome_java',
           'type': 'none',
           'dependencies': [
+            'activity_type_ids_java',
             'chrome_resources.gyp:chrome_strings',
             'profile_sync_service_model_type_selection_java',
             'resource_id_java',
@@ -1026,6 +1030,7 @@
             'common',
             'common_net',
             '../base/base.gyp:base',
+            '../components/components.gyp:cloud_devices',
             '../google_apis/google_apis.gyp:google_apis',
             '../jingle/jingle.gyp:notifier',
             '../net/net.gyp:net',
@@ -1036,25 +1041,18 @@
           'sources': [
             'service/chrome_service_application_mac.h',
             'service/chrome_service_application_mac.mm',
-            'service/service_ipc_server.cc',
-            'service/service_ipc_server.h',
-            'service/service_main.cc',
-            'service/service_process.cc',
-            'service/service_process.h',
-            'service/service_process_prefs.cc',
-            'service/service_process_prefs.h',
-            'service/service_utility_process_host.cc',
-            'service/service_utility_process_host.h',
+            'service/cloud_print/cdd_conversion_win.cc',
+            'service/cloud_print/cdd_conversion_win.h',
             'service/cloud_print/cloud_print_auth.cc',
             'service/cloud_print/cloud_print_auth.h',
             'service/cloud_print/cloud_print_connector.cc',
             'service/cloud_print/cloud_print_connector.h',
-            'service/cloud_print/cloud_print_service_helpers.cc',
-            'service/cloud_print/cloud_print_service_helpers.h',
             'service/cloud_print/cloud_print_proxy.cc',
             'service/cloud_print/cloud_print_proxy.h',
             'service/cloud_print/cloud_print_proxy_backend.cc',
             'service/cloud_print/cloud_print_proxy_backend.h',
+            'service/cloud_print/cloud_print_service_helpers.cc',
+            'service/cloud_print/cloud_print_service_helpers.h',
             'service/cloud_print/cloud_print_token_store.cc',
             'service/cloud_print/cloud_print_token_store.h',
             'service/cloud_print/cloud_print_url_fetcher.cc',
@@ -1067,24 +1065,27 @@
             'service/cloud_print/job_status_updater.h',
             'service/cloud_print/print_system.cc',
             'service/cloud_print/print_system.h',
+            'service/cloud_print/print_system_win.cc',
             'service/cloud_print/printer_job_handler.cc',
             'service/cloud_print/printer_job_handler.h',
             'service/cloud_print/printer_job_queue_handler.cc',
             'service/cloud_print/printer_job_queue_handler.h',
             'service/net/service_url_request_context.cc',
             'service/net/service_url_request_context.h',
+            'service/service_ipc_server.cc',
+            'service/service_ipc_server.h',
+            'service/service_main.cc',
+            'service/service_process.cc',
+            'service/service_process.h',
+            'service/service_process_prefs.cc',
+            'service/service_process_prefs.h',
+            'service/service_utility_process_host.cc',
+            'service/service_utility_process_host.h',
           ],
           'include_dirs': [
             '..',
           ],
           'conditions': [
-            ['OS=="win"', {
-              'sources': [
-                'service/cloud_print/print_system_win.cc',
-                'service/cloud_print/print_system_win.h',
-                'service/cloud_print/print_system_xps_win.cc',
-              ],
-            }],
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',