diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 21:49:34 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 21:49:34 +0000 |
| commit | f69f9528e227f48ce7c5bef6d482ff85316b6c2a (patch) | |
| tree | 40e4741a2402c8c963882f8efd3a525c9847afb9 /android_webview/java/src | |
| parent | e5c8f005def0b5b7a93bf182ee8fc951e44a6a0a (diff) | |
| download | chromium_src-f69f9528e227f48ce7c5bef6d482ff85316b6c2a.zip chromium_src-f69f9528e227f48ce7c5bef6d482ff85316b6c2a.tar.gz chromium_src-f69f9528e227f48ce7c5bef6d482ff85316b6c2a.tar.bz2 | |
Retrieve AwSettings.defaultTextEncoding from AwResource
A long-standing TODO that I have almost forgotten about.
WebView Classic was using com.android.internal.R.string.default_text_encoding
as the initial value. In our case, this value is propagated via AwResource.
Review URL: https://codereview.chromium.org/145483010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/java/src')
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwSettings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java index c271356..928c73e 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java @@ -59,8 +59,7 @@ public class AwSettings { private String mSerifFontFamily = "serif"; private String mCursiveFontFamily = "cursive"; private String mFantasyFontFamily = "fantasy"; - // TODO(mnaganov): Should be obtained from Android. Problem: it is hidden. - private String mDefaultTextEncoding = "Latin-1"; + private String mDefaultTextEncoding; private String mUserAgent; private int mMinimumFontSize = 8; private int mMinimumLogicalFontSize = 8; @@ -214,6 +213,7 @@ public class AwSettings { mAllowFileAccessFromFileURLs = true; } + mDefaultTextEncoding = AwResource.getDefaultTextEncoding(); mUserAgent = LazyDefaultUserAgent.sInstance; // Best-guess a sensible initial value based on the features supported on the device. |