summaryrefslogtreecommitdiffstats
path: root/ui/gfx
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 21:06:37 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 21:06:37 +0000
commit4f2b94f1ce652c4f0bc919627958b8a9cf233128 (patch)
tree5ab63a7a3f017bc0ccb8f8aa1769c0f580f9ab30 /ui/gfx
parent70637c944c29cc0f7f46c75e5db190da8aa9716b (diff)
downloadchromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.zip
chromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.tar.gz
chromium_src-4f2b94f1ce652c4f0bc919627958b8a9cf233128.tar.bz2
[Android] Make content_shell_apk and chromium_testshell components friendly.
This includes the remaining changes to atleast _compile_ the above targets. More work is needed for starting up the apps and running. Inclues: - Misc EXPORT additions (I assume I can TBR these) - Introduce a ShellDialogs JNI registrar since it's now a separate component and ui can't depend on it. - Random gyp tweaks that are needed to fully specify dependencies - Change from using NPN_MemAlloc to just plain malloc for the java bridge. For some reason the NPN_MemAlloc symbol cannot be found in the component build, but regardless all our implementations end up calling straight throught to malloc. BUG=158821 TBR=wjia@chromium.org,willchan@chromium.org,jcivelli@chromium.org Review URL: https://chromiumcodereview.appspot.com/12281017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx')
-rw-r--r--ui/gfx/android/window_android.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gfx/android/window_android.h b/ui/gfx/android/window_android.h
index 8c3aa32..12d541d 100644
--- a/ui/gfx/android/window_android.h
+++ b/ui/gfx/android/window_android.h
@@ -8,11 +8,12 @@
#include <jni.h>
#include "base/android/jni_helper.h"
#include "base/android/scoped_java_ref.h"
+#include "ui/base/ui_export.h"
namespace ui {
// Android implementation of the activity window.
-class WindowAndroid {
+class UI_EXPORT WindowAndroid {
public:
WindowAndroid(JNIEnv* env, jobject obj);