diff options
author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 23:47:49 +0000 |
---|---|---|
committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 23:47:49 +0000 |
commit | f3112a530100f9361f98c81aea8d9483a133a980 (patch) | |
tree | a6766b321c65636cfe96621ff54163e6fc1199f0 /content/renderer | |
parent | 08202909defd4f7890548dc73f1ec4e58fd0aec7 (diff) | |
download | chromium_src-f3112a530100f9361f98c81aea8d9483a133a980.zip chromium_src-f3112a530100f9361f98c81aea8d9483a133a980.tar.gz chromium_src-f3112a530100f9361f98c81aea8d9483a133a980.tar.bz2 |
more content exports needed for unit_tests and browser_tests.
R=jam@chromium.org
BUG=90442
TEST=
Review URL: http://codereview.chromium.org/8082019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r-- | content/renderer/p2p/p2p_transport_impl.h | 7 | ||||
-rw-r--r-- | content/renderer/render_view.h | 7 | ||||
-rw-r--r-- | content/renderer/render_widget.h | 11 | ||||
-rw-r--r-- | content/renderer/renderer_main_platform_delegate.h | 5 | ||||
-rw-r--r-- | content/renderer/renderer_webkitplatformsupport_impl.h | 6 |
5 files changed, 23 insertions, 13 deletions
diff --git a/content/renderer/p2p/p2p_transport_impl.h b/content/renderer/p2p/p2p_transport_impl.h index 82072b1..d4d1baa 100644 --- a/content/renderer/p2p/p2p_transport_impl.h +++ b/content/renderer/p2p/p2p_transport_impl.h @@ -8,7 +8,9 @@ #include <string> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" +#include "content/common/content_export.h" #include "net/base/completion_callback.h" #include "third_party/libjingle/source/talk/base/sigslot.h" #include "webkit/glue/p2p_transport.h" @@ -36,8 +38,9 @@ namespace content { class P2PPortAllocator; class P2PSocketDispatcher; -class P2PTransportImpl : public webkit_glue::P2PTransport, - public sigslot::has_slots<> { +class CONTENT_EXPORT P2PTransportImpl + : NON_EXPORTED_BASE(public webkit_glue::P2PTransport), + public sigslot::has_slots<> { public: // Creates P2PTransportImpl using specified NetworkManager and // PacketSocketFactory. Takes ownership of |network_manager| and diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h index 8666b69..245e196 100644 --- a/content/renderer/render_view.h +++ b/content/renderer/render_view.h @@ -177,7 +177,7 @@ class RenderView : public RenderWidget, // responsible for creating this RenderView (corresponding to parent_hwnd). // |counter| is either a currently initialized counter, or NULL (in which case // we treat this RenderView as a top level window). - static RenderView* Create( + CONTENT_EXPORT static RenderView* Create( RenderThreadBase* render_thread, gfx::NativeViewId parent_hwnd, int32 opener_id, @@ -816,7 +816,7 @@ class RenderView : public RenderWidget, const WebKit::WebMediaPlayerAction& action); void OnMouseLockLost(); void OnMoveOrResizeStarted(); - void OnNavigate(const ViewMsg_Navigate_Params& params); + CONTENT_EXPORT void OnNavigate(const ViewMsg_Navigate_Params& params); void OnPaste(); #if defined(OS_MACOSX) void OnPluginImeCompositionCompleted(const string16& text, int plugin_id); @@ -837,7 +837,8 @@ class RenderView : public RenderWidget, void OnSetBackground(const SkBitmap& background); void OnSetWebUIProperty(const std::string& name, const std::string& value); void OnSetEditCommandsForNextKeyEvent(const EditCommands& edit_commands); - void OnSetHistoryLengthAndPrune(int history_length, int32 minimum_page_id); + CONTENT_EXPORT void OnSetHistoryLengthAndPrune(int history_length, + int32 minimum_page_id); void OnSetInitialFocus(bool reverse); #if defined(OS_MACOSX) void OnSetInLiveResize(bool in_live_resize); diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 0980575..f44f289 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -9,9 +9,11 @@ #include <vector> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" +#include "content/common/content_export.h" #include "content/renderer/paint_aggregator.h" #include "ipc/ipc_channel.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" @@ -60,10 +62,11 @@ class PluginInstance; // RenderWidget provides a communication bridge between a WebWidget and // a RenderWidgetHost, the latter of which lives in a different process. -class RenderWidget : public IPC::Channel::Listener, - public IPC::Message::Sender, - virtual public WebKit::WebWidgetClient, - public base::RefCounted<RenderWidget> { +class CONTENT_EXPORT RenderWidget + : public IPC::Channel::Listener, + public IPC::Message::Sender, + NON_EXPORTED_BASE(virtual public WebKit::WebWidgetClient), + public base::RefCounted<RenderWidget> { public: // Creates a new RenderWidget. The opener_id is the routing ID of the // RenderView that this widget lives inside. The render_thread is any diff --git a/content/renderer/renderer_main_platform_delegate.h b/content/renderer/renderer_main_platform_delegate.h index c57e90e..8ca6ba4 100644 --- a/content/renderer/renderer_main_platform_delegate.h +++ b/content/renderer/renderer_main_platform_delegate.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. @@ -6,9 +6,10 @@ #define CHROME_RENDERER_RENDERER_MAIN_PLATFORM_DELEGATE_H_ #pragma once +#include "content/common/content_export.h" #include "content/common/main_function_params.h" -class RendererMainPlatformDelegate { +class CONTENT_EXPORT RendererMainPlatformDelegate { public: explicit RendererMainPlatformDelegate(const MainFunctionParams& parameters); ~RendererMainPlatformDelegate(); diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h index 9517693..def554b 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.h +++ b/content/renderer/renderer_webkitplatformsupport_impl.h @@ -6,8 +6,10 @@ #define CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_ #pragma once +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" +#include "content/common/content_export.h" #include "webkit/glue/webkitplatformsupport_impl.h" class WebSharedWorkerRepositoryImpl; @@ -21,8 +23,8 @@ namespace webkit_glue { class WebClipboardImpl; } -class RendererWebKitPlatformSupportImpl - : public webkit_glue::WebKitPlatformSupportImpl { +class CONTENT_EXPORT RendererWebKitPlatformSupportImpl + : NON_EXPORTED_BASE(public webkit_glue::WebKitPlatformSupportImpl) { public: RendererWebKitPlatformSupportImpl(); virtual ~RendererWebKitPlatformSupportImpl(); |