summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/Tab.java
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2014-07-24 22:40:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-24 15:35:58 +0000
commit4b9f51307eb0d65063728ab7ae2d52e9dc5bd2ab (patch)
treeb0e0b88298d275588b0b67cbc2eeba731cedc6c2 /src/com/android/browser/Tab.java
parent762e4d2693371fb68c5504cda5f1adceb80c4186 (diff)
parent79ff1e36c4660c532fd8e5f4ab264e967fe308d0 (diff)
downloadpackages_apps_Browser-4b9f51307eb0d65063728ab7ae2d52e9dc5bd2ab.tar.gz
packages_apps_Browser-4b9f51307eb0d65063728ab7ae2d52e9dc5bd2ab.tar.bz2
packages_apps_Browser-4b9f51307eb0d65063728ab7ae2d52e9dc5bd2ab.zip
Merge "Update AOSP browser to use the new FileChooser API" into lmp-dev
Diffstat (limited to 'src/com/android/browser/Tab.java')
-rw-r--r--src/com/android/browser/Tab.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 84565e52d..d463045ee 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1001,7 +1001,7 @@ class Tab implements PictureListener {
}
@Override
- public boolean showFileChooser(WebView webView, ValueCallback<Uri[]> callback,
+ public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> callback,
FileChooserParams params) {
if (mInForeground) {
mWebViewController.showFileChooser(callback, params);