| 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 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1123 | 1123 |
| 1124 settings->setSelectionIncludesAltImageText(true); | 1124 settings->setSelectionIncludesAltImageText(true); |
| 1125 | 1125 |
| 1126 #if defined(OS_ANDROID) | 1126 #if defined(OS_ANDROID) |
| 1127 settings->setAllowCustomScrollbarInMainFrame(false); | 1127 settings->setAllowCustomScrollbarInMainFrame(false); |
| 1128 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1128 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
| 1129 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1129 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
| 1130 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1130 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
| 1131 settings->setDisallowFullscreenForNonMediaElements( | 1131 settings->setDisallowFullscreenForNonMediaElements( |
| 1132 prefs.disallow_fullscreen_for_non_media_elements); | 1132 prefs.disallow_fullscreen_for_non_media_elements); |
| 1133 settings->setFullscreenSupported(prefs.fullscreen_supported); |
| 1133 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1134 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
| 1134 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1135 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
| 1135 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1136 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
| 1136 settings->setMediaControlsOverlayPlayButtonEnabled(true); | 1137 settings->setMediaControlsOverlayPlayButtonEnabled(true); |
| 1137 settings->setMediaPlaybackRequiresUserGesture( | 1138 settings->setMediaPlaybackRequiresUserGesture( |
| 1138 prefs.user_gesture_required_for_media_playback); | 1139 prefs.user_gesture_required_for_media_playback); |
| 1139 settings->setDefaultVideoPosterURL( | 1140 settings->setDefaultVideoPosterURL( |
| 1140 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); | 1141 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); |
| 1141 settings->setSupportDeprecatedTargetDensityDPI( | 1142 settings->setSupportDeprecatedTargetDensityDPI( |
| 1142 prefs.support_deprecated_target_density_dpi); | 1143 prefs.support_deprecated_target_density_dpi); |
| (...skipping 3169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4312 std::vector<gfx::Size> sizes; | 4313 std::vector<gfx::Size> sizes; |
| 4313 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4314 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4314 if (!url.isEmpty()) | 4315 if (!url.isEmpty()) |
| 4315 urls.push_back( | 4316 urls.push_back( |
| 4316 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4317 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4317 } | 4318 } |
| 4318 SendUpdateFaviconURL(urls); | 4319 SendUpdateFaviconURL(urls); |
| 4319 } | 4320 } |
| 4320 | 4321 |
| 4321 } // namespace content | 4322 } // namespace content |
| OLD | NEW |