summaryrefslogtreecommitdiffstats
path: root/base/android
diff options
context:
space:
mode:
authoraurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-18 21:47:56 +0000
committeraurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-18 21:47:56 +0000
commit2d02a200c2f156c8e80b2396f80b87756cdc425b (patch)
tree0faeb5881c32ce8bae5be35e6c042b7eeaf8b48c /base/android
parent41a8da1d1c970c0c7b7076beccb549592b4f60f8 (diff)
downloadchromium_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 'base/android')
-rwxr-xr-xbase/android/jni_generator/jni_generator.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py
index 33d2a13..9c29099 100755
--- a/base/android/jni_generator/jni_generator.py
+++ b/base/android/jni_generator/jni_generator.py
@@ -151,6 +151,7 @@ def JavaParamToJni(param):
'Lcom/google/android/apps/chrome/AutofillData',
'Lcom/google/android/apps/chrome/ChromeHttpAuthHandler',
'Lcom/google/android/apps/chrome/ChromeContextMenuInfo',
+ 'Lcom/google/android/apps/chrome/ChromeWindow',
'Lcom/google/android/apps/chrome/OmniboxSuggestion',
'Lcom/google/android/apps/chrome/PageInfoViewer',
'Lcom/google/android/apps/chrome/Tab',
@@ -170,7 +171,6 @@ def JavaParamToJni(param):
'Lorg/chromium/chrome/browser/FindNotificationDetails',
'Lorg/chromium/chrome/browser/JavascriptAppModalDialog',
'Lorg/chromium/chrome/browser/ProcessUtils',
- 'Lorg/chromium/chrome/browser/SelectFileDialog',
'Lorg/chromium/chrome/browser/component/web_contents_delegate_android/WebContentsDelegateAndroid',
'Lorg/chromium/content/browser/ContentVideoView',
'Lorg/chromium/content/browser/ContentViewClient',
@@ -191,6 +191,8 @@ def JavaParamToJni(param):
'Lorg/chromium/media/MediaPlayerListener',
'Lorg/chromium/net/NetworkChangeNotifier',
'Lorg/chromium/net/ProxyChangeListener',
+ 'Lorg/chromium/ui/gfx/NativeWindow',
+ 'Lorg/chromium/ui/SelectFileDialog',
]
if param == 'byte[][]':
return '[[B'