| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1125 | 1125 |
| 1126 settings->setSelectionIncludesAltImageText(true); | 1126 settings->setSelectionIncludesAltImageText(true); |
| 1127 | 1127 |
| 1128 #if defined(OS_ANDROID) | 1128 #if defined(OS_ANDROID) |
| 1129 settings->setAllowCustomScrollbarInMainFrame(false); | 1129 settings->setAllowCustomScrollbarInMainFrame(false); |
| 1130 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1130 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
| 1131 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1131 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
| 1132 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1132 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
| 1133 settings->setDisallowFullscreenForNonMediaElements( | 1133 settings->setDisallowFullscreenForNonMediaElements( |
| 1134 prefs.disallow_fullscreen_for_non_media_elements); | 1134 prefs.disallow_fullscreen_for_non_media_elements); |
| 1135 settings->setFullscreenSupported(prefs.fullscreen_supported); |
| 1135 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1136 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
| 1136 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1137 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
| 1137 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1138 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
| 1138 settings->setMediaControlsOverlayPlayButtonEnabled(true); | 1139 settings->setMediaControlsOverlayPlayButtonEnabled(true); |
| 1139 settings->setMediaPlaybackRequiresUserGesture( | 1140 settings->setMediaPlaybackRequiresUserGesture( |
| 1140 prefs.user_gesture_required_for_media_playback); | 1141 prefs.user_gesture_required_for_media_playback); |
| 1141 settings->setDefaultVideoPosterURL( | 1142 settings->setDefaultVideoPosterURL( |
| 1142 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); | 1143 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); |
| 1143 settings->setSupportDeprecatedTargetDensityDPI( | 1144 settings->setSupportDeprecatedTargetDensityDPI( |
| 1144 prefs.support_deprecated_target_density_dpi); | 1145 prefs.support_deprecated_target_density_dpi); |
| (...skipping 3145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4290 std::vector<gfx::Size> sizes; | 4291 std::vector<gfx::Size> sizes; |
| 4291 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4292 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4292 if (!url.isEmpty()) | 4293 if (!url.isEmpty()) |
| 4293 urls.push_back( | 4294 urls.push_back( |
| 4294 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4295 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4295 } | 4296 } |
| 4296 SendUpdateFaviconURL(urls); | 4297 SendUpdateFaviconURL(urls); |
| 4297 } | 4298 } |
| 4298 | 4299 |
| 4299 } // namespace content | 4300 } // namespace content |
| OLD | NEW |