summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2015-07-29 18:54:21 -0700
committerSelim Gurun <sgurun@google.com>2015-07-30 01:55:10 +0000
commit854512f954f3ace72215547b0188e5197328bce2 (patch)
tree4dacb91034b5959305d00753b53e7bd934e45764 /android_webview
parent0eaea93ffad7aceb82c1a90333af69a16831ea87 (diff)
downloadchromium_src-854512f954f3ace72215547b0188e5197328bce2.zip
chromium_src-854512f954f3ace72215547b0188e5197328bce2.tar.gz
chromium_src-854512f954f3ace72215547b0188e5197328bce2.tar.bz2
Support sending Web Uri
BUG=497258,515202 When onProvideAssistContent is requested, send web uri unless incognito mode is enabled. Review URL: https://codereview.chromium.org/1260753003 Cr-Commit-Position: refs/heads/master@{#340629} (cherry picked from commit a8eb4d62dde410cb13dad0d9845364d2d5cbc37f) Review URL: https://codereview.chromium.org/1258513007 . Cr-Commit-Position: refs/branch-heads/2454@{#181} Cr-Branched-From: 12bfc3360892ec53cd00fc239a47e5298beb063b-refs/heads/master@{#338390}
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/apk/java/proguard.flags2
1 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/apk/java/proguard.flags b/android_webview/apk/java/proguard.flags
index 0e2ffb6..20a9b95 100644
--- a/android_webview/apk/java/proguard.flags
+++ b/android_webview/apk/java/proguard.flags
@@ -84,3 +84,5 @@
public static **[] values();
public static ** valueOf(java.lang.String);
}
+
+-dontwarn android.app.assist.* \ No newline at end of file