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 1117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1128 | 1128 |
1129 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); | 1129 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); |
1130 | 1130 |
1131 settings->setSelectionIncludesAltImageText(true); | 1131 settings->setSelectionIncludesAltImageText(true); |
1132 | 1132 |
1133 #if defined(OS_ANDROID) | 1133 #if defined(OS_ANDROID) |
1134 settings->setAllowCustomScrollbarInMainFrame(false); | 1134 settings->setAllowCustomScrollbarInMainFrame(false); |
1135 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1135 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
1136 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1136 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
1137 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1137 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
| 1138 settings->setDisallowFullscreenForNonMediaElements( |
| 1139 prefs.disallow_fullscreen_for_non_media_elements); |
1138 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1140 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
1139 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1141 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
1140 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1142 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
1141 settings->setMediaControlsOverlayPlayButtonEnabled(true); | 1143 settings->setMediaControlsOverlayPlayButtonEnabled(true); |
1142 settings->setMediaPlaybackRequiresUserGesture( | 1144 settings->setMediaPlaybackRequiresUserGesture( |
1143 prefs.user_gesture_required_for_media_playback); | 1145 prefs.user_gesture_required_for_media_playback); |
1144 settings->setDefaultVideoPosterURL( | 1146 settings->setDefaultVideoPosterURL( |
1145 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); | 1147 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); |
1146 settings->setSupportDeprecatedTargetDensityDPI( | 1148 settings->setSupportDeprecatedTargetDensityDPI( |
1147 prefs.support_deprecated_target_density_dpi); | 1149 prefs.support_deprecated_target_density_dpi); |
(...skipping 3128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4276 std::vector<gfx::Size> sizes; | 4278 std::vector<gfx::Size> sizes; |
4277 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4279 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4278 if (!url.isEmpty()) | 4280 if (!url.isEmpty()) |
4279 urls.push_back( | 4281 urls.push_back( |
4280 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4282 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4281 } | 4283 } |
4282 SendUpdateFaviconURL(urls); | 4284 SendUpdateFaviconURL(urls); |
4283 } | 4285 } |
4284 | 4286 |
4285 } // namespace content | 4287 } // namespace content |
OLD | NEW |