diff options
| author | mkosiba <mkosiba@chromium.org> | 2014-10-13 05:33:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-13 12:33:15 +0000 |
| commit | 72ea36f782c38afb93387afe3cb6cf69ba9ab429 (patch) | |
| tree | 2a068f0af8009e8a7242ab3b5d26f11009c9d08a /android_webview/test | |
| parent | 068e72c61fb59fd91825b3291bb2eae21cee590e (diff) | |
| download | chromium_src-72ea36f782c38afb93387afe3cb6cf69ba9ab429.zip chromium_src-72ea36f782c38afb93387afe3cb6cf69ba9ab429.tar.gz chromium_src-72ea36f782c38afb93387afe3cb6cf69ba9ab429.tar.bz2 | |
[android_webview] Hardcode the default text encoding to UTF-8.
The WebView will use a fixed default value for the text encoding instead
of getting it from the platform. This is in attempt to unify behavior
between devices.
BUG=422366
Review URL: https://codereview.chromium.org/639113004
Cr-Commit-Position: refs/heads/master@{#299287}
Diffstat (limited to 'android_webview/test')
| -rw-r--r-- | android_webview/test/shell/res/values/strings.xml | 11 | ||||
| -rw-r--r-- | android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/android_webview/test/shell/res/values/strings.xml b/android_webview/test/shell/res/values/strings.xml deleted file mode 100644 index a62403f..0000000 --- a/android_webview/test/shell/res/values/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- -Copyright (c) 2012 The Chromium Authors. All rights reserved. -Use of this source code is governed by a BSD-style license that can be -found in the LICENSE file. ---> - -<resources> - <string name="default_encoding">Latin-1</string> -</resources> 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 d086fe1..beb2d0f 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 @@ -23,8 +23,6 @@ public class AwShellResourceProvider { AwResource.setErrorPageResources(R.raw.error, R.raw.blank_html); - AwResource.setDefaultTextEncoding(R.string.default_encoding); - AwResource.setConfigKeySystemUuidMapping(R.array.config_key_system_uuid_mapping); sInitialized = true; |