X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fchrome_common.gypi;h=1234265c21ebc395c89bbf1f325a99978e5c8b87;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=9779e145c8c60deb5bee582443390e32e418aed3;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/chrome_common.gypi b/src/chrome/chrome_common.gypi
index 9779e14..1234265 100644
--- a/src/chrome/chrome_common.gypi
+++ b/src/chrome/chrome_common.gypi
@@ -67,8 +67,6 @@
         'common/automation_messages_internal.h',
         'common/badge_util.cc',
         'common/badge_util.h',
-        'common/cancelable_task_tracker.cc',
-        'common/cancelable_task_tracker.h',
         'common/child_process_logging.h',
         'common/child_process_logging_win.cc',
         'common/chrome_content_client.cc',
@@ -113,6 +111,12 @@
         'common/custom_handlers/protocol_handler.h',
         'common/descriptors_android.h',
         'common/encrypted_media_messages_android.h',
+        'common/extensions/api/bluetooth/bluetooth_manifest_data.cc',
+        'common/extensions/api/bluetooth/bluetooth_manifest_data.h',
+        'common/extensions/api/bluetooth/bluetooth_manifest_handler.cc',
+        'common/extensions/api/bluetooth/bluetooth_manifest_handler.h',
+        'common/extensions/api/bluetooth/bluetooth_manifest_permission.cc',
+        'common/extensions/api/bluetooth/bluetooth_manifest_permission.h',
         'common/extensions/api/commands/commands_handler.cc',
         'common/extensions/api/commands/commands_handler.h',
         'common/extensions/api/extension_action/action_info.cc',
@@ -215,10 +219,6 @@
         'common/extensions/message_bundle.h',
         'common/extensions/mime_types_handler.cc',
         'common/extensions/mime_types_handler.h',
-        'common/extensions/permissions/bluetooth_permission.cc',
-        'common/extensions/permissions/bluetooth_permission.h',
-        'common/extensions/permissions/bluetooth_permission_data.cc',
-        'common/extensions/permissions/bluetooth_permission_data.h',
         'common/extensions/permissions/chrome_api_permissions.cc',
         'common/extensions/permissions/chrome_api_permissions.h',
         'common/extensions/permissions/chrome_permission_message_provider.cc',
@@ -318,8 +318,6 @@
         'common/multi_process_lock_linux.cc',
         'common/multi_process_lock_mac.cc',
         'common/multi_process_lock_win.cc',
-        'common/omaha_query_params/omaha_query_params.cc',
-        'common/omaha_query_params/omaha_query_params.h',
         'common/omnibox_focus_state.h',
         'common/partial_circular_buffer.cc',
         'common/partial_circular_buffer.h',
@@ -329,6 +327,7 @@
         'common/pepper_permission_util.h',
         'common/pref_names_util.cc',
         'common/pref_names_util.h',
+        'common/prerender_types.h',
         'common/print_messages.cc',
         'common/print_messages.h',
         'common/profiling.cc',
@@ -416,6 +415,7 @@
             '<(DEPTH)/chrome/common/extensions/api/api.gyp:api',
             '<(DEPTH)/components/components.gyp:autofill_core_common',
             '<(DEPTH)/components/components.gyp:autofill_content_common',
+            '<(DEPTH)/components/components.gyp:password_manager_core_common',
             '<(DEPTH)/components/nacl.gyp:nacl_common',
             '<(DEPTH)/components/components.gyp:visitedlink_common',
             '<(DEPTH)/extensions/extensions.gyp:extensions_common',
@@ -460,11 +460,6 @@
             '<(DEPTH)/printing/printing.gyp:printing',
           ],
         }],
-        ['OS!="ios" and chrome_multiple_dll!=1', {
-          'dependencies': [
-            '<(DEPTH)/webkit/glue/webkit_glue.gyp:glue',
-          ],
-        }],
         ['OS=="android"', {
           'sources/': [
             ['exclude', '^common/chrome_version_info_posix.cc'],
@@ -500,18 +495,13 @@
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:x11',
+            '../build/linux/system.gyp:xrender',
+            '../build/linux/system.gyp:xext',
           ],
           'export_dependent_settings': [
             '../third_party/sqlite/sqlite.gyp:sqlite',
           ],
-          'link_settings': {
-            'libraries': [
-              '-lX11',
-              '-lXrender',
-              '-lXss',
-              '-lXext',
-            ],
-          },
         }],
         ['chromeos==1', {
           'sources!': [
@@ -546,11 +536,6 @@
             'common/pepper_permission_util.cc',
           ],
         }],
-        ['use_system_nspr==1', {
-          'dependencies': [
-            '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr',
-          ],
-        }],
         ['enable_webrtc==0', {
           'sources!': [
             'common/media/webrtc_logging_messages.h',
@@ -698,8 +683,10 @@
             'dependencies': [
               '../third_party/openssl/openssl.gyp:openssl',
             ],
-          },
-        ],
+            'sources!': [
+              'common/net/x509_certificate_model.cc',
+            ],
+        }],
         ['use_openssl==1', {
             'sources!': [
               'common/net/x509_certificate_model_nss.cc',