diff options
| author | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-18 21:47:56 +0000 |
|---|---|---|
| committer | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-18 21:47:56 +0000 |
| commit | 2d02a200c2f156c8e80b2396f80b87756cdc425b (patch) | |
| tree | 0faeb5881c32ce8bae5be35e6c042b7eeaf8b48c /content/app | |
| parent | 41a8da1d1c970c0c7b7076beccb549592b4f60f8 (diff) | |
| download | chromium_src-2d02a200c2f156c8e80b2396f80b87756cdc425b.zip chromium_src-2d02a200c2f156c8e80b2396f80b87756cdc425b.tar.gz chromium_src-2d02a200c2f156c8e80b2396f80b87756cdc425b.tar.bz2 | |
Upstreaming SelectFileDialog for Android
Upstreaming the Select File Dialog and its dependencies needed for
Chrome on Android
BUG=116131
Review URL: https://chromiumcodereview.appspot.com/10916160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157424 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 65b3b24..a60155f 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -24,6 +24,7 @@ #include "content/public/common/content_switches.h" #include "media/base/android/media_jni_registrar.h" #include "net/android/net_jni_registrar.h" +#include "ui/android/ui_jni_registrar.h" #include "jni/LibraryLoader_jni.h" #include "ui/gfx/android/gfx_jni_registrar.h" @@ -66,6 +67,9 @@ static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, if (!net::android::RegisterJni(env)) return JNI_FALSE; + if (!ui::RegisterJni(env)) + return JNI_FALSE; + if (!content::android::RegisterCommonJni(env)) return JNI_FALSE; |