Move the rest of webkit/glue into content/common

webkit/glue/webkit_glue.gypi

Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
deleted file mode 100644
index a4ad0a88cd91c0ca7e87fa723b6eef745022bead..0000000000000000000000000000000000000000
--- a/webkit/glue/webkit_glue.gypi
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'target_defaults': {
-     # Disable narrowing-conversion-in-initialization-list warnings in that we
-     # do not want to fix it in data file "webcursor_gtk_data.h".
-     'cflags+': ['-Wno-narrowing'],
-     'cflags_cc+': ['-Wno-narrowing'],
-  },
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'glue',
-      'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'defines': [
-        'WEBKIT_EXTENSIONS_IMPLEMENTATION',
-        'WEBKIT_GLUE_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/base/base.gyp:base_static',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
-        '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-        '<(DEPTH)/ui/gl/gl.gyp:gl',
-        '<(DEPTH)/url/url.gyp:url_lib',
-        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
-        '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
-        '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-        '<(DEPTH)/webkit/storage_browser.gyp:webkit_storage_browser',
-        '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
-        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
-        '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
-      ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)/webkit',
-        '<(SHARED_INTERMEDIATE_DIR)/ui',
-      ],
-      'sources': [
-        'simple_webmimeregistry_impl.cc',
-        'simple_webmimeregistry_impl.h',
-        'webfileutilities_impl.cc',
-        'webfileutilities_impl.h',
-        'webkit_glue.cc',
-        'webkit_glue.h',
-        'webkit_glue_export.h',
-      ],
-      # When glue is a dependency, it needs to be a hard dependency.
-      # Dependents may rely on files generated by this target or one of its
-      # own hard dependencies.
-      'hard_dependency': 1,
-      'conditions': [
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-          ],
-          'sources/': [['exclude', '_x11\\.cc$']],
-        }],
-        ['use_aura==1 and use_x11==1', {
-          'link_settings': {
-            'libraries': [ '-lXcursor', ],
-          },
-        }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4800, 4267 ],
-          'conditions': [
-            ['component=="shared_library"', {
-              'dependencies': [
-                 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-               ],
-               'export_dependent_settings': [
-                 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-                 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-               ],
-            }],
-          ],
-        }],
-        ['chrome_multiple_dll!=1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-          ],
-        }],
-        ['enable_printing!=0', {
-          'dependencies': [
-            '<(DEPTH)/printing/printing.gyp:printing',
-          ],
-        }],
-      ],
-    },
-  ],
-  'conditions': [
-    ['use_third_party_translations==1', {
-      'targets': [
-        {
-          'target_name': 'inspector_strings',
-          'type': 'none',
-          'variables': {
-            'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
-          },
-          'actions': [
-            {
-              'action_name': 'inspector_strings',
-              'variables': {
-                'grit_grd_file': 'inspector_strings.grd',
-              },
-              'includes': [ '../../build/grit_action.gypi' ],
-            },
-          ],
-          'includes': [ '../../build/grit_target.gypi' ],
-        },
-      ],
-    }],
-  ],
-}