Fix components build on Linux when toolkit_views=1.

BUG=90442

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

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

content/browser/debugger/worker_devtools_manager.h

@@ -28,7 +28,7 @@ class WorkerDevToolsManager : private WorkerServiceObserver {
   static WorkerDevToolsManager* GetInstance();
 
   // Called on the UI thread.
-  static CONTENT_EXPORT DevToolsAgentHost* GetDevToolsAgentHostForWorker(
+  CONTENT_EXPORT static DevToolsAgentHost* GetDevToolsAgentHostForWorker(
       int worker_process_id,
       int worker_route_id);
 

content/browser/geolocation/device_data_provider.h

@@ -347,7 +347,7 @@ class DeviceDataProvider : public base::NonThreadSafe {
     impl_->StopDataProvider();
   }
 
-  static CONTENT_EXPORT DeviceDataProviderImplBase<DataType>*
+  CONTENT_EXPORT static DeviceDataProviderImplBase<DataType>*
       DefaultFactoryFunction();
 
   // The singleton-like instance of this class. (Not 'true' singleton, as it

content/browser/renderer_host/gtk_window_utils.h

@@ -6,6 +6,8 @@
 #define CONTENT_BROWSER_RENDERER_HOST_GTK_WINDOW_UTILS_H_
 #pragma once
 
+#include "content/common/content_export.h"
+
 typedef struct _GdkDrawable GdkWindow;
 
 namespace WebKit {
@@ -14,7 +16,7 @@ struct WebScreenInfo;
 
 namespace content {
 
-void GetScreenInfoFromNativeWindow(
+CONTENT_EXPORT void GetScreenInfoFromNativeWindow(
     GdkWindow* gdk_window, WebKit::WebScreenInfo* results);
 
 }  // namespace content

content/browser/renderer_host/render_widget_host_view.h

@@ -276,7 +276,8 @@ class RenderWidgetHostView {
 #endif
 
 #if defined(OS_POSIX) || defined(USE_AURA)
-  static void GetDefaultScreenInfo(WebKit::WebScreenInfo* results);
+  CONTENT_EXPORT static void GetDefaultScreenInfo(
+      WebKit::WebScreenInfo* results);
   virtual void GetScreenInfo(WebKit::WebScreenInfo* results) = 0;
   virtual gfx::Rect GetRootWindowBounds() = 0;
 #endif

content/gpu/gpu_info_collector.h

@@ -30,13 +30,13 @@ bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info);
 // The selection between the two methods is done in the cc file.
 
 // A D3D argument is passed in for testing purposes
-bool CONTENT_EXPORT CollectGraphicsInfoD3D(IDirect3D9* d3d,
+CONTENT_EXPORT bool CollectGraphicsInfoD3D(IDirect3D9* d3d,
                                            content::GPUInfo* gpu_info);
 
 // Collects D3D driver version/date through registry lookup.
 // Note that this does not require a D3D context.
 // device_id here is the raw data in DISPLAY_DEVICE.
-bool CONTENT_EXPORT CollectDriverInfoD3D(const std::wstring& device_id,
+CONTENT_EXPORT bool CollectDriverInfoD3D(const std::wstring& device_id,
                                          content::GPUInfo* gpu_info);
 
 // Collect the DirectX Disagnostics information about the attached displays.
@@ -44,7 +44,7 @@ bool GetDxDiagnostics(content::DxDiagNode* output);
 #endif
 
 // All platforms have a GL version for collecting information
-bool CONTENT_EXPORT CollectGraphicsInfoGL(content::GPUInfo* gpu_info);
+CONTENT_EXPORT bool CollectGraphicsInfoGL(content::GPUInfo* gpu_info);
 
 // Collect GL and Shading language version information
 bool CollectGLVersionInfo(content::GPUInfo* gpu_info);

content/public/common/url_constants.h

@@ -50,7 +50,7 @@ extern const char kUnreachableWebDataURL[];
 // URLs that should be parsed as "standard" with the googleurl library. The
 // embedder can pass a 0-terminated list of additional schemes that should be
 // savable, or NULL if the standard list is sufficient.
-void CONTENT_EXPORT RegisterContentSchemes(
+CONTENT_EXPORT void RegisterContentSchemes(
     const char** additional_savable_schemes);
 
 }  // namespace chrome