From 4d59434c396e3d414ed4266103d6990a340331e1 Mon Sep 17 00:00:00 2001
From: Selim Gurun <sgurun@google.com>
Date: Tue, 17 Jun 2014 19:52:30 -0700
Subject: Modify AOSP browser to take advantage of new filechooser API.

Bug: 6930981
Change-Id: Id73512cd6e859ea9316f02e8f0d973b6e15d969b
---
 src/com/android/browser/Tab.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/com/android/browser/Tab.java')

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index ea5ad89d3..84565e52d 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -57,6 +57,7 @@ import android.webkit.URLUtil;
 import android.webkit.ValueCallback;
 import android.webkit.WebBackForwardList;
 import android.webkit.WebChromeClient;
+import android.webkit.WebChromeClient.FileChooserParams;
 import android.webkit.WebHistoryItem;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebStorage;
@@ -1000,11 +1001,13 @@ class Tab implements PictureListener {
         }
 
         @Override
-        public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) {
+        public boolean showFileChooser(WebView webView, ValueCallback<Uri[]> callback,
+            FileChooserParams params) {
             if (mInForeground) {
-                mWebViewController.openFileChooser(uploadMsg, acceptType, capture);
+                mWebViewController.showFileChooser(callback, params);
+                return true;
             } else {
-                uploadMsg.onReceiveValue(null);
+                return false;
             }
         }
 
-- 
cgit v1.2.3