diff options
33 files changed, 137 insertions, 96 deletions
diff --git a/base/android/base_jni_registrar.h b/base/android/base_jni_registrar.h index 678a3f3..fdaf5f2 100644 --- a/base/android/base_jni_registrar.h +++ b/base/android/base_jni_registrar.h @@ -7,11 +7,13 @@ #include <jni.h> +#include "base/base_export.h" + namespace base { namespace android { // Register all JNI bindings necessary for base. -bool RegisterJni(JNIEnv* env); +BASE_EXPORT bool RegisterJni(JNIEnv* env); } // namespace android } // namespace base diff --git a/base/android/jni_android.h b/base/android/jni_android.h index a3ac18a..16b85af 100644 --- a/base/android/jni_android.h +++ b/base/android/jni_android.h @@ -10,6 +10,7 @@ #include "base/android/scoped_java_ref.h" #include "base/atomicops.h" +#include "base/base_export.h" #include "base/compiler_specific.h" namespace base { @@ -25,41 +26,43 @@ struct RegistrationMethod { }; // Attach the current thread to the VM (if necessary) and return the JNIEnv*. -JNIEnv* AttachCurrentThread(); +BASE_EXPORT JNIEnv* AttachCurrentThread(); // Detach the current thread from VM if it is attached. -void DetachFromVM(); +BASE_EXPORT void DetachFromVM(); // Initializes the global JVM. It is not necessarily called before // InitApplicationContext(). -void InitVM(JavaVM* vm); +BASE_EXPORT void InitVM(JavaVM* vm); // Initializes the global application context object. The |context| can be any // valid reference to the application context. Internally holds a global ref to // the context. InitVM and InitApplicationContext maybe called in either order. -void InitApplicationContext(const JavaRef<jobject>& context); +BASE_EXPORT void InitApplicationContext(const JavaRef<jobject>& context); // Gets a global ref to the application context set with // InitApplicationContext(). Ownership is retained by the function - the caller // must NOT release it. -const jobject GetApplicationContext(); +const BASE_EXPORT jobject GetApplicationContext(); // Finds the class named |class_name| and returns it. // Use this method instead of invoking directly the JNI FindClass method (to // prevent leaking local references). // This method triggers a fatal assertion if the class could not be found. // Use HasClass if you need to check whether the class exists. -ScopedJavaLocalRef<jclass> GetClass(JNIEnv* env, const char* class_name); +BASE_EXPORT ScopedJavaLocalRef<jclass> GetClass(JNIEnv* env, + const char* class_name); // Similar to the above, but the caller is responsible to manage the jclass // lifetime. -jclass GetUnscopedClass(JNIEnv* env, const char* class_name) WARN_UNUSED_RESULT; +BASE_EXPORT jclass GetUnscopedClass(JNIEnv* env, + const char* class_name) WARN_UNUSED_RESULT; // Returns true iff the class |class_name| could be found. -bool HasClass(JNIEnv* env, const char* class_name); +BASE_EXPORT bool HasClass(JNIEnv* env, const char* class_name); // This class is a wrapper for JNIEnv Get(Static)MethodID. -class MethodID { +class BASE_EXPORT MethodID { public: enum Type { TYPE_STATIC, @@ -92,41 +95,41 @@ class MethodID { // beyond the duration of all future calls to this function, across all // threads. In practice, this means that the function should only be used with // string constants. -jmethodID GetMethodIDFromClassName(JNIEnv* env, - const char* class_name, - const char* method, - const char* jni_signature); +BASE_EXPORT jmethodID GetMethodIDFromClassName(JNIEnv* env, + const char* class_name, + const char* method, + const char* jni_signature); // Gets the field ID for a class field. // This method triggers a fatal assertion if the field could not be found. -jfieldID GetFieldID(JNIEnv* env, - const JavaRef<jclass>& clazz, - const char* field_name, - const char* jni_signature); +BASE_EXPORT jfieldID GetFieldID(JNIEnv* env, + const JavaRef<jclass>& clazz, + const char* field_name, + const char* jni_signature); // Returns true if |clazz| as a field with the given name and signature. // TODO(jcivelli): Determine whether we explicitly have to pass the environment. -bool HasField(JNIEnv* env, - const JavaRef<jclass>& clazz, - const char* field_name, - const char* jni_signature); - -// Gets the field ID for a static class field. -// This method triggers a fatal assertion if the field could not be found. -jfieldID GetStaticFieldID(JNIEnv* env, +BASE_EXPORT bool HasField(JNIEnv* env, const JavaRef<jclass>& clazz, const char* field_name, const char* jni_signature); +// Gets the field ID for a static class field. +// This method triggers a fatal assertion if the field could not be found. +BASE_EXPORT jfieldID GetStaticFieldID(JNIEnv* env, + const JavaRef<jclass>& clazz, + const char* field_name, + const char* jni_signature); + // Returns true if an exception is pending in the provided JNIEnv*. -bool HasException(JNIEnv* env); +BASE_EXPORT bool HasException(JNIEnv* env); // If an exception is pending in the provided JNIEnv*, this function clears it // and returns true. -bool ClearException(JNIEnv* env); +BASE_EXPORT bool ClearException(JNIEnv* env); // This function will call CHECK() macro if there's any pending exception. -void CheckException(JNIEnv* env); +BASE_EXPORT void CheckException(JNIEnv* env); } // namespace android } // namespace base diff --git a/base/android/jni_array.h b/base/android/jni_array.h index e9f6213..86433a3 100644 --- a/base/android/jni_array.h +++ b/base/android/jni_array.h @@ -17,42 +17,47 @@ namespace base { namespace android { // Returns a new Java byte array converted from the given bytes array. -ScopedJavaLocalRef<jbyteArray> ToJavaByteArray( +BASE_EXPORT ScopedJavaLocalRef<jbyteArray> ToJavaByteArray( JNIEnv* env, const uint8* bytes, size_t len); // Returns a array of Java byte array converted from |v|. -ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfByteArray( +BASE_EXPORT ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfByteArray( JNIEnv* env, const std::vector<std::string>& v); -ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings( +BASE_EXPORT ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings( JNIEnv* env, const std::vector<std::string>& v); -ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings( +BASE_EXPORT ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings( JNIEnv* env, const std::vector<string16>& v); // Converts a Java string array to a native array. -void AppendJavaStringArrayToStringVector(JNIEnv* env, - jobjectArray array, - std::vector<string16>* out); +BASE_EXPORT void AppendJavaStringArrayToStringVector( + JNIEnv* env, + jobjectArray array, + std::vector<string16>* out); -void AppendJavaStringArrayToStringVector(JNIEnv* env, - jobjectArray array, - std::vector<std::string>* out); +BASE_EXPORT void AppendJavaStringArrayToStringVector( + JNIEnv* env, + jobjectArray array, + std::vector<std::string>* out); // Appends the Java bytes in |bytes_array| onto the end of |out|. -void AppendJavaByteArrayToByteVector(JNIEnv* env, - jbyteArray byte_array, - std::vector<uint8>* out); +BASE_EXPORT void AppendJavaByteArrayToByteVector( + JNIEnv* env, + jbyteArray byte_array, + std::vector<uint8>* out); // Replaces the content of |out| with the Java bytes in |bytes_array|. -void JavaByteArrayToByteVector(JNIEnv* env, - jbyteArray byte_array, - std::vector<uint8>* out); +BASE_EXPORT void JavaByteArrayToByteVector( + JNIEnv* env, + jbyteArray byte_array, + std::vector<uint8>* out); // Replaces the content of |out| with the Java ints in |int_array|. -void JavaIntArrayToIntVector(JNIEnv* env, - jintArray int_array, - std::vector<int>* out); +BASE_EXPORT void JavaIntArrayToIntVector( + JNIEnv* env, + jintArray int_array, + std::vector<int>* out); } // namespace android } // namespace base diff --git a/base/android/jni_helper.h b/base/android/jni_helper.h index 22883cb..895bf95 100644 --- a/base/android/jni_helper.h +++ b/base/android/jni_helper.h @@ -7,13 +7,14 @@ #include <jni.h> +#include "base/base_export.h" #include "base/android/scoped_java_ref.h" // Manages WeakGlobalRef lifecycle. // This class is not thread-safe w.r.t. get() and reset(). Multiple threads may // safely use get() concurrently, but if the user calls reset() (or of course, // calls the destructor) they'll need to provide their own synchronization. -class JavaObjectWeakGlobalRef { +class BASE_EXPORT JavaObjectWeakGlobalRef { public: JavaObjectWeakGlobalRef(); JavaObjectWeakGlobalRef(const JavaObjectWeakGlobalRef& orig); @@ -34,7 +35,7 @@ class JavaObjectWeakGlobalRef { // Get the real object stored in the weak reference returned as a // ScopedJavaLocalRef. -base::android::ScopedJavaLocalRef<jobject> GetRealObject( +BASE_EXPORT base::android::ScopedJavaLocalRef<jobject> GetRealObject( JNIEnv* env, jweak obj); #endif // BASE_ANDROID_JNI_HELPER_H_ diff --git a/base/android/jni_registrar.h b/base/android/jni_registrar.h index ba8f074..849d07f 100644 --- a/base/android/jni_registrar.h +++ b/base/android/jni_registrar.h @@ -6,6 +6,7 @@ #define BASE_ANDROID_JNI_REGISTRAR_H_ #include <jni.h> +#include "base/base_export.h" #include "base/basictypes.h" namespace base { @@ -16,9 +17,9 @@ struct RegistrationMethod; // Registers the JNI bindings for the specified |method| definition containing // |count| elements. Returns whether the registration of the given methods // succeeded. -bool RegisterNativeMethods(JNIEnv* env, - const RegistrationMethod* method, - size_t count); +BASE_EXPORT bool RegisterNativeMethods(JNIEnv* env, + const RegistrationMethod* method, + size_t count); } // namespace android } // namespace base diff --git a/base/android/jni_string.h b/base/android/jni_string.h index 43194a15..62c4d02 100644 --- a/base/android/jni_string.h +++ b/base/android/jni_string.h @@ -9,26 +9,27 @@ #include <string> #include "base/android/scoped_java_ref.h" +#include "base/base_export.h" #include "base/string_piece.h" namespace base { namespace android { // Convert a Java string to UTF8. Returns a std string. -std::string ConvertJavaStringToUTF8(JNIEnv* env, jstring str); -std::string ConvertJavaStringToUTF8(const JavaRef<jstring>& str); +BASE_EXPORT std::string ConvertJavaStringToUTF8(JNIEnv* env, jstring str); +BASE_EXPORT std::string ConvertJavaStringToUTF8(const JavaRef<jstring>& str); // Convert a std string to Java string. -ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString( +BASE_EXPORT ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString( JNIEnv* env, const base::StringPiece& str); // Convert a Java string to UTF16. Returns a string16. -string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str); -string16 ConvertJavaStringToUTF16(const JavaRef<jstring>& str); +BASE_EXPORT string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str); +BASE_EXPORT string16 ConvertJavaStringToUTF16(const JavaRef<jstring>& str); // Convert a string16 to a Java string. -ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString( +BASE_EXPORT ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString( JNIEnv* env, const base::StringPiece16& str); diff --git a/base/android/locale_utils.h b/base/android/locale_utils.h index c7f8f33..cef39f4 100644 --- a/base/android/locale_utils.h +++ b/base/android/locale_utils.h @@ -9,15 +9,16 @@ #include <string> +#include "base/base_export.h" #include "base/string16.h" namespace base { namespace android { // Return the current default locale of the device. -std::string GetDefaultLocale(); +BASE_EXPORT std::string GetDefaultLocale(); -string16 GetDisplayNameForLocale(const std::string& locale, +BASE_EXPORT string16 GetDisplayNameForLocale(const std::string& locale, const std::string& display_locale); bool RegisterLocaleUtils(JNIEnv* env); diff --git a/base/android/path_utils.h b/base/android/path_utils.h index 37349d3..0d95cd3 100644 --- a/base/android/path_utils.h +++ b/base/android/path_utils.h @@ -7,6 +7,8 @@ #include <jni.h> +#include "base/base_export.h" + class FilePath; namespace base { @@ -16,13 +18,13 @@ namespace android { // application. The result is placed in the FilePath pointed to by 'result'. // This method is dedicated for base_paths_android.c, Using // PathService::Get(base::DIR_ANDROID_APP_DATA, ...) gets the data dir. -bool GetDataDirectory(FilePath* result); +BASE_EXPORT bool GetDataDirectory(FilePath* result); // Retrieves the absolute path to the cache directory. The result is placed in // the FilePath pointed to by 'result'. This method is dedicated for // base_paths_android.c, Using PathService::Get(base::DIR_CACHE, ...) gets the // cache dir. -bool GetCacheDirectory(FilePath* result); +BASE_EXPORT bool GetCacheDirectory(FilePath* result); // Retrieves the path to the public downloads directory. The result is placed // in the FilePath pointed to by 'result'. @@ -35,7 +37,7 @@ bool GetNativeLibraryDirectory(FilePath* result); // Retrieves the absolute path to the external storage directory. The result // is placed in the FilePath pointed to by 'result'. -bool GetExternalStorageDirectory(FilePath* result); +BASE_EXPORT bool GetExternalStorageDirectory(FilePath* result); bool RegisterPathUtils(JNIEnv* env); diff --git a/base/android/scoped_java_ref.h b/base/android/scoped_java_ref.h index 0d1e590..a5d71e2 100644 --- a/base/android/scoped_java_ref.h +++ b/base/android/scoped_java_ref.h @@ -8,6 +8,7 @@ #include <jni.h> #include <stddef.h> +#include "base/base_export.h" #include "base/basictypes.h" namespace base { @@ -20,7 +21,7 @@ template<typename T> class JavaRef; // other JavaRef<> template types. This allows you to e.g. pass // ScopedJavaLocalRef<jstring> into a function taking const JavaRef<jobject>& template<> -class JavaRef<jobject> { +class BASE_EXPORT JavaRef<jobject> { public: jobject obj() const { return obj_; } diff --git a/base/message_pump_android.h b/base/message_pump_android.h index 10a5582..5ef4bd6 100644 --- a/base/message_pump_android.h +++ b/base/message_pump_android.h @@ -7,6 +7,7 @@ #include <jni.h> +#include "base/base_export.h" #include "base/compiler_specific.h" #include "base/message_pump.h" @@ -17,7 +18,7 @@ class TimeTicks; // This class implements a MessagePump needed for TYPE_UI MessageLoops on // OS_ANDROID platform. -class MessagePumpForUI : public MessagePump { +class BASE_EXPORT MessagePumpForUI : public MessagePump { public: MessagePumpForUI(); diff --git a/base/test/test_support_android.h b/base/test/test_support_android.h index 40648cd..062785e 100644 --- a/base/test/test_support_android.h +++ b/base/test/test_support_android.h @@ -5,19 +5,21 @@ #ifndef BASE_TEST_TEST_SUPPORT_ANDROID_H_ #define BASE_TEST_TEST_SUPPORT_ANDROID_H_ +#include "base/base_export.h" + namespace base { // Init logging for tests on Android. Logs will be output into Android's logcat. -void InitAndroidTestLogging(); +BASE_EXPORT void InitAndroidTestLogging(); // Init path providers for tests on Android. -void InitAndroidTestPaths(); +BASE_EXPORT void InitAndroidTestPaths(); // Init the message loop for tests on Android. -void InitAndroidTestMessageLoop(); +BASE_EXPORT void InitAndroidTestMessageLoop(); // Do all of the initializations above. -void InitAndroidTest(); +BASE_EXPORT void InitAndroidTest(); } // namespace base 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() { } diff --git a/crypto/openssl_util.h b/crypto/openssl_util.h index 577749e..b390fe7 100644 --- a/crypto/openssl_util.h +++ b/crypto/openssl_util.h @@ -85,7 +85,8 @@ void CRYPTO_EXPORT EnsureOpenSSLInit(); // Drains the OpenSSL ERR_get_error stack. On a debug build the error codes // are send to VLOG(1), on a release build they are disregarded. In most // cases you should pass FROM_HERE as the |location|. -void ClearOpenSSLERRStack(const tracked_objects::Location& location); +void CRYPTO_EXPORT ClearOpenSSLERRStack( + const tracked_objects::Location& location); // Place an instance of this class on the call stack to automatically clear // the OpenSSL error stack on function exit. diff --git a/media/base/android/cookie_getter.h b/media/base/android/cookie_getter.h index e076159..bf7cc55 100644 --- a/media/base/android/cookie_getter.h +++ b/media/base/android/cookie_getter.h @@ -8,11 +8,12 @@ #include <string> #include "base/callback.h" +#include "media/base/media_export.h" namespace media { // Class for asynchronously retrieving the cookies for a given URL. -class CookieGetter { +class MEDIA_EXPORT CookieGetter { public: typedef base::Callback<void(const std::string&)> GetCookieCB; virtual ~CookieGetter(); diff --git a/media/base/android/media_jni_registrar.h b/media/base/android/media_jni_registrar.h index b0ad6c6b..7e93702 100644 --- a/media/base/android/media_jni_registrar.h +++ b/media/base/android/media_jni_registrar.h @@ -7,10 +7,12 @@ #include <jni.h> +#include "media/base/media_export.h" + namespace media { // Register all JNI bindings necessary for media. -bool RegisterJni(JNIEnv* env); +MEDIA_EXPORT bool RegisterJni(JNIEnv* env); } // namespace media diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h index 242b071..de777b2 100644 --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h @@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/time.h" #include "base/timer.h" +#include "media/base/media_export.h" #include "media/base/android/media_player_listener.h" namespace media { @@ -29,7 +30,7 @@ class MediaPlayerBridgeManager; // Pause(), SeekTo() gets called. As a result, media information may not // be available until one of those operations is performed. After that, we // will cache those information in case the mediaplayer gets released. -class MediaPlayerBridge { +class MEDIA_EXPORT MediaPlayerBridge { public: // Error types for MediaErrorCB. enum MediaErrorType { diff --git a/media/base/android/media_player_bridge_manager.h b/media/base/android/media_player_bridge_manager.h index fc0c4ca..93bd99c 100644 --- a/media/base/android/media_player_bridge_manager.h +++ b/media/base/android/media_player_bridge_manager.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_MANAGER_H_ #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_MANAGER_H_ +#include "media/base/media_export.h" + namespace media { class MediaPlayerBridge; @@ -12,7 +14,7 @@ class MediaPlayerBridge; // This class is responsible for managing active MediaPlayerBridge objects. // It is implemented by webkit_media::MediaPlayerBridgeManagerImpl and // content::MediaPlayerManagerAndroid. -class MediaPlayerBridgeManager { +class MEDIA_EXPORT MediaPlayerBridgeManager { public: virtual ~MediaPlayerBridgeManager(); diff --git a/net/android/net_jni_registrar.h b/net/android/net_jni_registrar.h index 8fd0965..2b45fb2 100644 --- a/net/android/net_jni_registrar.h +++ b/net/android/net_jni_registrar.h @@ -7,11 +7,13 @@ #include <jni.h> +#include "net/base/net_export.h" + namespace net { namespace android { // Register all JNI bindings necessary for net. -bool RegisterJni(JNIEnv* env); +NET_EXPORT bool RegisterJni(JNIEnv* env); } // namespace android } // namespace net diff --git a/net/android/network_change_notifier_android.h b/net/android/network_change_notifier_android.h index f5311ac..e4d8469 100644 --- a/net/android/network_change_notifier_android.h +++ b/net/android/network_change_notifier_android.h @@ -15,7 +15,7 @@ namespace net { class NetworkChangeNotifierAndroidTest; -class NetworkChangeNotifierAndroid : public NetworkChangeNotifier { +class NET_EXPORT NetworkChangeNotifierAndroid : public NetworkChangeNotifier { public: virtual ~NetworkChangeNotifierAndroid(); diff --git a/net/android/network_change_notifier_factory_android.h b/net/android/network_change_notifier_factory_android.h index d4bd99f..8c5e414 100644 --- a/net/android/network_change_notifier_factory_android.h +++ b/net/android/network_change_notifier_factory_android.h @@ -6,6 +6,7 @@ #define NET_ANDROID_NETWORK_CHANGE_NOTIFIER_FACTORY_ANDROID_H_ #include "base/compiler_specific.h" +#include "net/base/net_export.h" #include "net/base/network_change_notifier_factory.h" namespace net { @@ -14,7 +15,7 @@ class NetworkChangeNotifier; // NetworkChangeNotifierFactory creates Android-specific specialization of // NetworkChangeNotifier. -class NetworkChangeNotifierFactoryAndroid : +class NET_EXPORT NetworkChangeNotifierFactoryAndroid : public NetworkChangeNotifierFactory { public: NetworkChangeNotifierFactoryAndroid(); diff --git a/net/android/network_library.h b/net/android/network_library.h index 7836b55..c505202 100644 --- a/net/android/network_library.h +++ b/net/android/network_library.h @@ -11,6 +11,7 @@ #include <vector> #include "base/basictypes.h" +#include "net/base/net_export.h" namespace net { namespace android { @@ -63,7 +64,7 @@ bool GetMimeTypeFromExtension(const std::string& extension, std::string* result); // Register JNI methods -bool RegisterNetworkLibrary(JNIEnv* env); +NET_EXPORT bool RegisterNetworkLibrary(JNIEnv* env); } // namespace android } // namespace net diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h index 907d0b9b..5475754 100644 --- a/net/base/network_delegate.h +++ b/net/base/network_delegate.h @@ -35,7 +35,7 @@ class HttpResponseHeaders; class SocketStream; class URLRequest; -class NetworkDelegate : public base::NonThreadSafe { +class NET_EXPORT NetworkDelegate : public base::NonThreadSafe { public: // AuthRequiredResponse indicates how a NetworkDelegate handles an // OnAuthRequired call. It's placed in this file to prevent url_request.h diff --git a/ui/android/ui_jni_registrar.h b/ui/android/ui_jni_registrar.h index a03c28d..d0778c4 100644 --- a/ui/android/ui_jni_registrar.h +++ b/ui/android/ui_jni_registrar.h @@ -7,10 +7,12 @@ #include <jni.h> +#include "ui/base/ui_export.h" + namespace ui { // Register all JNI bindings necessary for chrome. -bool RegisterJni(JNIEnv* env); +UI_EXPORT bool RegisterJni(JNIEnv* env); } // namespace ui diff --git a/ui/gfx/android/gfx_jni_registrar.h b/ui/gfx/android/gfx_jni_registrar.h index 1a71fdb..dc6f284 100644 --- a/ui/gfx/android/gfx_jni_registrar.h +++ b/ui/gfx/android/gfx_jni_registrar.h @@ -7,10 +7,12 @@ #include <jni.h> +#include "ui/base/ui_export.h" + namespace gfx { // Register all JNI bindings necessary for gfx. -bool RegisterJni(JNIEnv* env); +UI_EXPORT bool RegisterJni(JNIEnv* env); } // namespace gfx diff --git a/ui/gfx/android/java_bitmap.h b/ui/gfx/android/java_bitmap.h index 604026e..061bb76 100644 --- a/ui/gfx/android/java_bitmap.h +++ b/ui/gfx/android/java_bitmap.h @@ -15,7 +15,7 @@ namespace gfx { // This class wraps a JNI AndroidBitmap object to make it easier to use. It // handles locking and unlocking of the underlying pixels, along with wrapping // various JNI methods. -UI_EXPORT class JavaBitmap { +class UI_EXPORT JavaBitmap { public: explicit JavaBitmap(jobject bitmap); ~JavaBitmap(); @@ -36,10 +36,10 @@ UI_EXPORT class JavaBitmap { DISALLOW_COPY_AND_ASSIGN(JavaBitmap); }; -base::android::ScopedJavaLocalRef<jobject> CreateJavaBitmap( +UI_EXPORT base::android::ScopedJavaLocalRef<jobject> CreateJavaBitmap( const gfx::Size& size); -base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap( +UI_EXPORT base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap( const SkBitmap* skbitmap); SkBitmap CreateSkBitmapFromResource(const char* name); diff --git a/ui/gl/gl_surface_android.h b/ui/gl/gl_surface_android.h index d372aa2..009f42d 100644 --- a/ui/gl/gl_surface_android.h +++ b/ui/gl/gl_surface_android.h @@ -6,6 +6,7 @@ #define UI_GL_GL_SURFACE_ANDROID_H_ #include "base/memory/ref_counted.h" +#include "ui/base/ui_export.h" #include "ui/gl/gl_surface_egl.h" namespace gfx { @@ -15,7 +16,7 @@ namespace gfx { // it is initialized, it always uses a pbuffer EGL surface until the native view // is set. The native view is in charge of sharing the GL texture with UI thread // in the browser process through SurfaceTexture. -class AndroidViewSurface : public NativeViewGLSurfaceEGL { +class GL_EXPORT AndroidViewSurface : public NativeViewGLSurfaceEGL { public: AndroidViewSurface(); diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h index f45ce3a..5fedabe 100644 --- a/ui/gl/gl_surface_egl.h +++ b/ui/gl/gl_surface_egl.h @@ -58,7 +58,7 @@ class GL_EXPORT GLSurfaceEGL : public GLSurface { }; // Encapsulates an EGL surface bound to a view. -class NativeViewGLSurfaceEGL : public GLSurfaceEGL { +class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL { public: NativeViewGLSurfaceEGL(bool software, gfx::AcceleratedWidget window); |