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

Side by Side 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 6 years, 12 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/renderer/web_preferences.h" 5 #include "content/public/renderer/web_preferences.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "third_party/WebKit/public/platform/WebString.h" 8 #include "third_party/WebKit/public/platform/WebString.h"
9 #include "third_party/WebKit/public/platform/WebURL.h" 9 #include "third_party/WebKit/public/platform/WebURL.h"
10 #include "third_party/WebKit/public/web/WebKit.h" 10 #include "third_party/WebKit/public/web/WebKit.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 ApplyFontsFromMap(prefs.cursive_font_family_map, 124 ApplyFontsFromMap(prefs.cursive_font_family_map,
125 setCursiveFontFamilyWrapper, settings); 125 setCursiveFontFamilyWrapper, settings);
126 ApplyFontsFromMap(prefs.fantasy_font_family_map, 126 ApplyFontsFromMap(prefs.fantasy_font_family_map,
127 setFantasyFontFamilyWrapper, settings); 127 setFantasyFontFamilyWrapper, settings);
128 ApplyFontsFromMap(prefs.pictograph_font_family_map, 128 ApplyFontsFromMap(prefs.pictograph_font_family_map,
129 setPictographFontFamilyWrapper, settings); 129 setPictographFontFamilyWrapper, settings);
130 settings->setDefaultFontSize(prefs.default_font_size); 130 settings->setDefaultFontSize(prefs.default_font_size);
131 settings->setDefaultFixedFontSize(prefs.default_fixed_font_size); 131 settings->setDefaultFixedFontSize(prefs.default_fixed_font_size);
132 settings->setMinimumFontSize(prefs.minimum_font_size); 132 settings->setMinimumFontSize(prefs.minimum_font_size);
133 settings->setMinimumLogicalFontSize(prefs.minimum_logical_font_size); 133 settings->setMinimumLogicalFontSize(prefs.minimum_logical_font_size);
134 settings->setDefaultTextEncodingName(ASCIIToUTF16(prefs.default_encoding)); 134 settings->setDefaultTextEncodingName(
135 base::ASCIIToUTF16(prefs.default_encoding));
135 settings->setJavaScriptEnabled(prefs.javascript_enabled); 136 settings->setJavaScriptEnabled(prefs.javascript_enabled);
136 settings->setWebSecurityEnabled(prefs.web_security_enabled); 137 settings->setWebSecurityEnabled(prefs.web_security_enabled);
137 settings->setJavaScriptCanOpenWindowsAutomatically( 138 settings->setJavaScriptCanOpenWindowsAutomatically(
138 prefs.javascript_can_open_windows_automatically); 139 prefs.javascript_can_open_windows_automatically);
139 settings->setLoadsImagesAutomatically(prefs.loads_images_automatically); 140 settings->setLoadsImagesAutomatically(prefs.loads_images_automatically);
140 settings->setImagesEnabled(prefs.images_enabled); 141 settings->setImagesEnabled(prefs.images_enabled);
141 settings->setPluginsEnabled(prefs.plugins_enabled); 142 settings->setPluginsEnabled(prefs.plugins_enabled);
142 settings->setDOMPasteAllowed(prefs.dom_paste_enabled); 143 settings->setDOMPasteAllowed(prefs.dom_paste_enabled);
143 settings->setNeedsSiteSpecificQuirks(prefs.site_specific_quirks_enabled); 144 settings->setNeedsSiteSpecificQuirks(prefs.site_specific_quirks_enabled);
144 settings->setShrinksStandaloneImagesToFit( 145 settings->setShrinksStandaloneImagesToFit(
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); 335 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor);
335 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); 336 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment);
336 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); 337 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom);
337 settings->setAutoZoomFocusedNodeToLegibleScale(true); 338 settings->setAutoZoomFocusedNodeToLegibleScale(true);
338 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); 339 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled);
339 settings->setMediaPlaybackRequiresUserGesture( 340 settings->setMediaPlaybackRequiresUserGesture(
340 prefs.user_gesture_required_for_media_playback); 341 prefs.user_gesture_required_for_media_playback);
341 settings->setMediaFullscreenRequiresUserGesture( 342 settings->setMediaFullscreenRequiresUserGesture(
342 prefs.user_gesture_required_for_media_fullscreen); 343 prefs.user_gesture_required_for_media_fullscreen);
343 settings->setDefaultVideoPosterURL( 344 settings->setDefaultVideoPosterURL(
344 ASCIIToUTF16(prefs.default_video_poster_url.spec())); 345 base::ASCIIToUTF16(prefs.default_video_poster_url.spec()));
345 settings->setSupportDeprecatedTargetDensityDPI( 346 settings->setSupportDeprecatedTargetDensityDPI(
346 prefs.support_deprecated_target_density_dpi); 347 prefs.support_deprecated_target_density_dpi);
347 settings->setUseLegacyBackgroundSizeShorthandBehavior( 348 settings->setUseLegacyBackgroundSizeShorthandBehavior(
348 prefs.use_legacy_background_size_shorthand_behavior); 349 prefs.use_legacy_background_size_shorthand_behavior);
349 settings->setWideViewportQuirkEnabled(prefs.wide_viewport_quirk); 350 settings->setWideViewportQuirkEnabled(prefs.wide_viewport_quirk);
350 settings->setUseWideViewport(prefs.use_wide_viewport); 351 settings->setUseWideViewport(prefs.use_wide_viewport);
351 settings->setViewportMetaLayoutSizeQuirk( 352 settings->setViewportMetaLayoutSizeQuirk(
352 prefs.viewport_meta_layout_size_quirk); 353 prefs.viewport_meta_layout_size_quirk);
353 settings->setViewportMetaMergeContentQuirk( 354 settings->setViewportMetaMergeContentQuirk(
354 prefs.viewport_meta_merge_content_quirk); 355 prefs.viewport_meta_merge_content_quirk);
(...skipping 17 matching lines...) Expand all
372 settings->setPinchVirtualViewportEnabled( 373 settings->setPinchVirtualViewportEnabled(
373 prefs.pinch_virtual_viewport_enabled); 374 prefs.pinch_virtual_viewport_enabled);
374 375
375 settings->setPinchOverlayScrollbarThickness( 376 settings->setPinchOverlayScrollbarThickness(
376 prefs.pinch_overlay_scrollbar_thickness); 377 prefs.pinch_overlay_scrollbar_thickness);
377 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 378 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
378 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); 379 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
379 } 380 }
380 381
381 } // namespace content 382 } // namespace content
OLDNEW
« 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