diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 21:06:37 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 21:06:37 +0000 |
| commit | 4f2b94f1ce652c4f0bc919627958b8a9cf233128 (patch) | |
| tree | 5ab63a7a3f017bc0ccb8f8aa1769c0f580f9ab30 /ui/android | |
| parent | 70637c944c29cc0f7f46c75e5db190da8aa9716b (diff) | |
| download | chromium_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/android')
| -rw-r--r-- | ui/android/ui_jni_registrar.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ui/android/ui_jni_registrar.cc b/ui/android/ui_jni_registrar.cc index 11daf36..37a3fb8 100644 --- a/ui/android/ui_jni_registrar.cc +++ b/ui/android/ui_jni_registrar.cc @@ -9,7 +9,6 @@ #include "ui/gfx/android/device_display_info.h" #include "ui/gfx/android/java_bitmap.h" #include "ui/gfx/android/window_android.h" -#include "ui/shell_dialogs/select_file_dialog_android.h" namespace ui { namespace android { @@ -18,7 +17,6 @@ static base::android::RegistrationMethod kUiRegisteredMethods[] = { { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo }, { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap }, { "NativeWindow", ui::WindowAndroid::RegisterWindowAndroid }, - { "SelectFileDialog", ui::SelectFileDialogImpl::RegisterSelectFileDialog }, }; bool RegisterJni(JNIEnv* env) { |