diff options
author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-20 19:07:22 +0000 |
---|---|---|
committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-20 19:07:22 +0000 |
commit | 801edb5e32b17541bec8c927a48b1ebd96b67ed1 (patch) | |
tree | fb2e36735837c9d7a48edc31b715597726ad62ff /android_webview/test | |
parent | a09ea7e7c27aa551a3f0929b4a78f585c1605821 (diff) | |
download | chromium_src-801edb5e32b17541bec8c927a48b1ebd96b67ed1.zip chromium_src-801edb5e32b17541bec8c927a48b1ebd96b67ed1.tar.gz chromium_src-801edb5e32b17541bec8c927a48b1ebd96b67ed1.tar.bz2 |
[AndroidWebView] Properly escape the "Web Page Unavailable" document.
BUG=344887
Review URL: https://codereview.chromium.org/172573002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/test')
-rw-r--r-- | android_webview/test/shell/res/raw/error.html | 6 | ||||
-rw-r--r-- | android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/android_webview/test/shell/res/raw/error.html b/android_webview/test/shell/res/raw/error.html new file mode 100644 index 0000000..ec1ee5c --- /dev/null +++ b/android_webview/test/shell/res/raw/error.html @@ -0,0 +1,6 @@ +<html> + <head> + <title>Error</title> + <p>An error occured loading %s</p> + </head> +</html> diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java index dd54ad3..bfc8125 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java @@ -21,7 +21,7 @@ public class AwShellResourceProvider { AwResource.setResources(context.getResources()); - AwResource.setErrorPageResources(R.raw.blank_html, R.raw.blank_html); + AwResource.setErrorPageResources(R.raw.error, R.raw.blank_html); AwResource.setDefaultTextEncoding(R.string.default_encoding); |