| Index: content/renderer/pepper/pepper_plugin_delegate_impl.cc
|
| diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
|
| index 427af74c99d081004e09de9cc007e99cf83ac605..a11b942915cf3a13cd6ec784e7e81dc18c6c2b7d 100644
|
| --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
|
| +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
|
| @@ -1363,9 +1363,7 @@ gfx::Size PepperPluginDelegateImpl::GetScreenSize() {
|
| }
|
|
|
| std::string PepperPluginDelegateImpl::GetDefaultEncoding() {
|
| - // TODO(brettw) bug 56615: Somehow get the preference for the default
|
| - // encoding here rather than using the global default for the UI language.
|
| - return GetContentClient()->renderer()->GetDefaultEncoding();
|
| + return render_view_->webkit_preferences().default_encoding;
|
| }
|
|
|
| void PepperPluginDelegateImpl::ZoomLimitsChanged(double minimum_factor,
|
|
|