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

Unified Diff: content/renderer/web_preferences.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « content/renderer/speech_recognition_dispatcher.cc ('k') | content/renderer/webclipboard_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/web_preferences.cc
diff --git a/content/renderer/web_preferences.cc b/content/renderer/web_preferences.cc
index 5a94512667e8e348ff695ad2c668c1e5b032cd52..b3cf5a4f95395b17bc16fe960006181911d59898 100644
--- a/content/renderer/web_preferences.cc
+++ b/content/renderer/web_preferences.cc
@@ -131,7 +131,8 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
settings->setDefaultFixedFontSize(prefs.default_fixed_font_size);
settings->setMinimumFontSize(prefs.minimum_font_size);
settings->setMinimumLogicalFontSize(prefs.minimum_logical_font_size);
- settings->setDefaultTextEncodingName(ASCIIToUTF16(prefs.default_encoding));
+ settings->setDefaultTextEncodingName(
+ base::ASCIIToUTF16(prefs.default_encoding));
settings->setJavaScriptEnabled(prefs.javascript_enabled);
settings->setWebSecurityEnabled(prefs.web_security_enabled);
settings->setJavaScriptCanOpenWindowsAutomatically(
@@ -341,7 +342,7 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
settings->setMediaFullscreenRequiresUserGesture(
prefs.user_gesture_required_for_media_fullscreen);
settings->setDefaultVideoPosterURL(
- ASCIIToUTF16(prefs.default_video_poster_url.spec()));
+ base::ASCIIToUTF16(prefs.default_video_poster_url.spec()));
settings->setSupportDeprecatedTargetDensityDPI(
prefs.support_deprecated_target_density_dpi);
settings->setUseLegacyBackgroundSizeShorthandBehavior(
« no previous file with comments | « content/renderer/speech_recognition_dispatcher.cc ('k') | content/renderer/webclipboard_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698