summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 17:38:47 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 17:38:47 +0000
commitbe363b2ae7d3ebc594d6db53313985b07977d80b (patch)
tree72fda6b181f221cbaa6e438e0fb696bbf47d518b /content
parent42af17eaa9447b313098eca6fd5d018934cd0bbd (diff)
downloadchromium_src-be363b2ae7d3ebc594d6db53313985b07977d80b.zip
chromium_src-be363b2ae7d3ebc594d6db53313985b07977d80b.tar.gz
chromium_src-be363b2ae7d3ebc594d6db53313985b07977d80b.tar.bz2
First step towards component build for Android.
Add symbol exports needed to build content shell. BUG=158821 Review URL: https://codereview.chromium.org/11368031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/app/android/content_main.cc1
-rw-r--r--content/browser/android/draw_delegate_impl.h3
-rw-r--r--content/browser/renderer_host/compositor_impl_android.h5
-rw-r--r--content/public/app/android_library_loader_hooks.h6
-rw-r--r--content/public/app/content_main.h2
-rw-r--r--content/public/browser/android/compositor.h3
-rw-r--r--content/public/browser/android/draw_delegate.h3
7 files changed, 14 insertions, 9 deletions
diff --git a/content/app/android/content_main.cc b/content/app/android/content_main.cc
index 0e146c4e..4059de4 100644
--- a/content/app/android/content_main.cc
+++ b/content/app/android/content_main.cc
@@ -8,6 +8,7 @@
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/lazy_instance.h"
+#include "content/public/app/content_main.h"
#include "content/public/app/content_main_delegate.h"
#include "content/public/app/content_main_runner.h"
#include "content/public/common/content_switches.h"
diff --git a/content/browser/android/draw_delegate_impl.h b/content/browser/android/draw_delegate_impl.h
index 211927f..4bd1b4a 100644
--- a/content/browser/android/draw_delegate_impl.h
+++ b/content/browser/android/draw_delegate_impl.h
@@ -6,13 +6,14 @@
#define CONTENT_BROWSER_ANDROID_DRAW_DELEGATE_IMPL_H_
#include "base/callback.h"
+#include "content/common/content_export.h"
#include "content/public/browser/android/draw_delegate.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
namespace content {
-class DrawDelegateImpl : public DrawDelegate {
+class CONTENT_EXPORT DrawDelegateImpl : public DrawDelegate {
public:
static DrawDelegateImpl* GetInstance();
DrawDelegateImpl();
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index 9ca479a..aef913d 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -8,6 +8,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
#include "content/public/browser/android/compositor.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
@@ -21,8 +22,8 @@ class GraphicsContext;
// -----------------------------------------------------------------------------
// Browser-side compositor that manages a tree of content and UI layers.
// -----------------------------------------------------------------------------
-class CompositorImpl : public Compositor,
- public WebKit::WebLayerTreeViewClient {
+class CONTENT_EXPORT CompositorImpl : public Compositor,
+ public WebKit::WebLayerTreeViewClient {
public:
explicit CompositorImpl(Compositor::Client* client);
virtual ~CompositorImpl();
diff --git a/content/public/app/android_library_loader_hooks.h b/content/public/app/android_library_loader_hooks.h
index 515671e..c4bec7e 100644
--- a/content/public/app/android_library_loader_hooks.h
+++ b/content/public/app/android_library_loader_hooks.h
@@ -8,6 +8,7 @@
#include <jni.h>
#include "base/basictypes.h"
+#include "content/common/content_export.h"
namespace content {
@@ -15,13 +16,12 @@ namespace content {
// exposed to the calling java code. This handles only registering the content
// specific callbacks. Any application specific JNI bindings should happen
// once the native library has fully loaded.
-bool RegisterLibraryLoaderEntryHook(JNIEnv* env);
+CONTENT_EXPORT bool RegisterLibraryLoaderEntryHook(JNIEnv* env);
// Call on exit to delete the AtExitManager which OnLibraryLoadedOnUIThread
// created.
-void LibraryLoaderExitHook();
+CONTENT_EXPORT void LibraryLoaderExitHook();
} // namespace content
#endif // CONTENT_PUBLIC_APP_ANDROID_LIBRARY_LOADER_HOOKS_H_
-
diff --git a/content/public/app/content_main.h b/content/public/app/content_main.h
index cd17d74..5016edd 100644
--- a/content/public/app/content_main.h
+++ b/content/public/app/content_main.h
@@ -37,7 +37,7 @@ CONTENT_EXPORT int ContentMain(HINSTANCE instance,
// ContentMainRunner.
// This should only be called once before ContentMainRunner actually running.
// The ownership of |delegate| is transferred.
-void SetContentMainDelegate(ContentMainDelegate* delegate);
+CONTENT_EXPORT void SetContentMainDelegate(ContentMainDelegate* delegate);
#else
CONTENT_EXPORT int ContentMain(int argc,
const char** argv,
diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h
index 721b5fd..11c1dbd 100644
--- a/content/public/browser/android/compositor.h
+++ b/content/public/browser/android/compositor.h
@@ -6,6 +6,7 @@
#define CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_H_
#include "base/callback.h"
+#include "content/common/content_export.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
@@ -23,7 +24,7 @@ class WebLayer;
namespace content {
// An interface to the browser-side compositor.
-class Compositor {
+class CONTENT_EXPORT Compositor {
public:
class Client {
public:
diff --git a/content/public/browser/android/draw_delegate.h b/content/public/browser/android/draw_delegate.h
index 1cff5b7..fd5ea3f 100644
--- a/content/public/browser/android/draw_delegate.h
+++ b/content/public/browser/android/draw_delegate.h
@@ -6,6 +6,7 @@
#define CONTENT_PUBLIC_BROWSER_ANDROID_DRAW_DELEGATE_H_
#include "base/callback.h"
+#include "content/common/content_export.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
@@ -15,7 +16,7 @@ class RenderWidgetHostView;
// TODO(sievers): Route sizing of views through ContentViewCore
// and remove this class.
-class DrawDelegate {
+class CONTENT_EXPORT DrawDelegate {
public:
static DrawDelegate* GetInstance();
virtual ~DrawDelegate() { }