Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2188)

Unified Diff: content/renderer/pepper/pepper_plugin_delegate_impl.cc

Issue 10834297: Change PPB_CharSet_Dev.GetDefaultCharSet to return the default encoding of the web contents instead… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698