enable component build of webkit_glue.

Also fixes a few straggling missing dependencies.

R=darin@chromium.org
BUG=98755
TEST=waterfall stays green

Review URL: http://codereview.chromium.org/8819004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113696 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 14 insertions, 7 deletions

diff --git a/webkit/extensions/webkit_extensions_export.h b/webkit/extensions/webkit_extensions_export.h
index d48c4ef..f560907 100644
--- a/webkit/extensions/webkit_extensions_export.h
+++ b/webkit/extensions/webkit_extensions_export.h
@@ -6,7 +6,7 @@
 #define WEBKIT_EXTENSIONS_WEBKIT_EXTENSIONS_EXPORT_H_
 #pragma once
 
-#if 0 // defined(COMPONENT_BUILD)
+#if defined(COMPONENT_BUILD)
 #if defined(WIN32)
 
 #if defined(WEBKIT_EXTENSIONS_IMPLEMENTATION)
diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h
index cbbec387..895d689 100644
--- a/webkit/glue/context_menu.h
+++ b/webkit/glue/context_menu.h
@@ -25,7 +25,7 @@ struct CustomContextMenuContext {
   // It could also be |kCurrentRenderWidget|, which means the render widget that
   // the corresponding ViewHostMsg_ContextMenu is sent to.
   int32 render_widget_id;
-  static const int32 kCurrentRenderWidget;
+  WEBKIT_GLUE_EXPORT static const int32 kCurrentRenderWidget;
 
   WEBKIT_GLUE_EXPORT CustomContextMenuContext();
 };
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 2f3a882..d2a97e0 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -106,7 +106,7 @@
     },
     {
       'target_name': 'glue',
-      'type': 'static_library',
+      'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         'WEBKIT_EXTENSIONS_IMPLEMENTATION',
diff --git a/webkit/glue/webkit_glue_export.h b/webkit/glue/webkit_glue_export.h
index 8dfccad..1a72fc2 100644
--- a/webkit/glue/webkit_glue_export.h
+++ b/webkit/glue/webkit_glue_export.h
@@ -6,7 +6,7 @@
 #define WEBKIT_GLUE_WEBKIT_GLUE_EXPORT_H_
 #pragma once
 
-#if 0 // defined(COMPONENT_BUILD)
+#if defined(COMPONENT_BUILD)
 #if defined(WIN32)
 
 #if defined(WEBKIT_GLUE_IMPLEMENTATION)
diff --git a/webkit/plugins/npapi/gtk_plugin_container_manager.h b/webkit/plugins/npapi/gtk_plugin_container_manager.h
index 3152bc7..480aebd 100644
--- a/webkit/plugins/npapi/gtk_plugin_container_manager.h
+++ b/webkit/plugins/npapi/gtk_plugin_container_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -9,6 +9,7 @@
 #include <map>
 
 #include "ui/gfx/native_widget_types.h"
+#include "webkit/plugins/webkit_plugins_export.h"
 
 typedef struct _GtkWidget GtkWidget;
 
@@ -18,7 +19,7 @@ namespace npapi {
 struct WebPluginGeometry;
 
 // Helper class that creates and manages plugin containers (GtkSocket).
-class GtkPluginContainerManager {
+class WEBKIT_PLUGINS_EXPORT GtkPluginContainerManager {
  public:
   GtkPluginContainerManager();
   ~GtkPluginContainerManager();
diff --git a/webkit/plugins/webkit_plugins_export.h b/webkit/plugins/webkit_plugins_export.h
index 1f4bef9..fce6503 100644
--- a/webkit/plugins/webkit_plugins_export.h
+++ b/webkit/plugins/webkit_plugins_export.h
@@ -6,7 +6,7 @@
 #define WEBKIT_PLUGINS_WEBKIT_PLUGINS_EXPORT_H_
 #pragma once
 
-#if 0 // defined(COMPONENT_BUILD)
+#if defined(COMPONENT_BUILD)
 #if defined(WIN32)
 
 #if defined(WEBKIT_PLUGINS_IMPLEMENTATION)
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 33b17d2..65ae3c7 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -26,6 +26,7 @@
         'webkit_gpu',
         'webkit_media',
         'webkit_support_common',
+        'webkit_user_agent',
       ],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/webkit', # for a header generated by grit
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 21e1314..082c502 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -28,6 +28,7 @@
         'chromium_code': 1,
       },
       'dependencies': [
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
@@ -49,6 +50,7 @@
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_media',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support_common',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_user_agent',
       ],
       'sources': [
         'mac/test_shell_webview.h',
@@ -345,17 +347,20 @@
         'chromium_code': 1,
       },
       'dependencies': [
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         'test_shell_common',
         'test_shell_test_support',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/media/media.gyp:media_test_support',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/net/net.gyp:net_test_support',
+        '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_user_agent',
       ],
       'sources': [
         '../../../skia/ext/convolver_unittest.cc',