summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@android.com>2015-03-02 23:07:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-02 23:07:30 +0000
commit8898ecf7d4a2da1468b9e566157bcd8e383a3fc9 (patch)
treec031c26592302e2c733599e23c32d213e0f7ec00
parent20135337834a8c6bee94dd2ae45e16dc60832480 (diff)
parent7ed31a7d6ff6434a7ac858087953a8d1786d18c0 (diff)
downloadandroid_frameworks_webview-8898ecf7d4a2da1468b9e566157bcd8e383a3fc9.tar.gz
android_frameworks_webview-8898ecf7d4a2da1468b9e566157bcd8e383a3fc9.tar.bz2
android_frameworks_webview-8898ecf7d4a2da1468b9e566157bcd8e383a3fc9.zip
am 7ed31a7d: Merge "Implement stub functions"
* commit '7ed31a7d6ff6434a7ac858087953a8d1786d18c0': Implement stub functions
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewChromium.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index b38c40d..2146919 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -55,6 +55,8 @@ import android.webkit.JavascriptInterface;
import android.webkit.ValueCallback;
import android.webkit.WebBackForwardList;
import android.webkit.WebChromeClient;
+import android.webkit.WebMessage;
+import android.webkit.WebMessagePort;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
@@ -1420,6 +1422,16 @@ class WebViewChromium implements WebViewProvider,
}
@Override
+ public WebMessagePort[] createWebMessageChannel() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void postMessageToMainFrame(WebMessage message, Uri targetOrigin) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public WebSettings getSettings() {
return mWebSettings;
}