diff options
| author | mnaganov <mnaganov@chromium.org> | 2015-08-05 13:09:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-05 20:10:29 +0000 |
| commit | f082f6cb6e1c2b57554bb9b91b6dbd7214027c4f (patch) | |
| tree | 7dfc25929a9e1ab9f72d57ac9ded91bea0d36513 /android_webview/test | |
| parent | dad5f3d8a876981d8a053bd2f81b13e2b69bb1a6 (diff) | |
| download | chromium_src-f082f6cb6e1c2b57554bb9b91b6dbd7214027c4f.zip chromium_src-f082f6cb6e1c2b57554bb9b91b6dbd7214027c4f.tar.gz chromium_src-f082f6cb6e1c2b57554bb9b91b6dbd7214027c4f.tar.bz2 | |
[Android WebView] Put error page files into WebView resources
Historically, the load error pages displayed by WebView were a part of
Android framework resources. This change adds them into WebView
resources. This way, the pages will be accessible to sandboxed child
services, using Chromium's resource sharing mechanisms.
Unlike Chrome's error pages, which use WebUI, WebView pages are
completely static, as JavaScript can be disabled.
BUG=515691
Review URL: https://codereview.chromium.org/1270793002
Cr-Commit-Position: refs/heads/master@{#341951}
Diffstat (limited to 'android_webview/test')
3 files changed, 0 insertions, 13 deletions
diff --git a/android_webview/test/shell/res/raw/blank_html.html b/android_webview/test/shell/res/raw/blank_html.html deleted file mode 100644 index 989fbfc..0000000 --- a/android_webview/test/shell/res/raw/blank_html.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> - <head> - <title>This page intentionally left blank.</title> - </head> -</html> diff --git a/android_webview/test/shell/res/raw/error.html b/android_webview/test/shell/res/raw/error.html deleted file mode 100644 index ec1ee5c..0000000 --- a/android_webview/test/shell/res/raw/error.html +++ /dev/null @@ -1,6 +0,0 @@ -<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 beb2d0f..4aa695d 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,8 +21,6 @@ public class AwShellResourceProvider { AwResource.setResources(context.getResources()); - AwResource.setErrorPageResources(R.raw.error, R.raw.blank_html); - AwResource.setConfigKeySystemUuidMapping(R.array.config_key_system_uuid_mapping); sInitialized = true; |