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 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1071 settings->setV8CacheOptions( | 1071 settings->setV8CacheOptions( |
1072 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); | 1072 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); |
1073 | 1073 |
1074 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); | 1074 settings->setV8ScriptStreamingEnabled(prefs.v8_script_streaming_enabled); |
1075 | 1075 |
1076 #if defined(OS_ANDROID) | 1076 #if defined(OS_ANDROID) |
1077 settings->setAllowCustomScrollbarInMainFrame(false); | 1077 settings->setAllowCustomScrollbarInMainFrame(false); |
1078 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); | 1078 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); |
1079 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); | 1079 settings->setAccessibilityFontScaleFactor(prefs.font_scale_factor); |
1080 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); | 1080 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment); |
1081 settings->setDisallowFullscreenForNonMediaElements( | |
1082 prefs.disallow_fullscreen_for_non_media_elements); | |
1083 settings->setFullscreenSupported(prefs.fullscreen_supported); | 1081 settings->setFullscreenSupported(prefs.fullscreen_supported); |
1084 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); | 1082 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); |
1085 settings->setAutoZoomFocusedNodeToLegibleScale(true); | 1083 settings->setAutoZoomFocusedNodeToLegibleScale(true); |
1086 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); | 1084 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); |
1087 settings->setMediaControlsOverlayPlayButtonEnabled(true); | 1085 settings->setMediaControlsOverlayPlayButtonEnabled(true); |
1088 settings->setMediaPlaybackRequiresUserGesture( | 1086 settings->setMediaPlaybackRequiresUserGesture( |
1089 prefs.user_gesture_required_for_media_playback); | 1087 prefs.user_gesture_required_for_media_playback); |
1090 settings->setDefaultVideoPosterURL( | 1088 settings->setDefaultVideoPosterURL( |
1091 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); | 1089 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); |
1092 settings->setSupportDeprecatedTargetDensityDPI( | 1090 settings->setSupportDeprecatedTargetDensityDPI( |
(...skipping 3091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4184 std::vector<gfx::Size> sizes; | 4182 std::vector<gfx::Size> sizes; |
4185 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4183 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4186 if (!url.isEmpty()) | 4184 if (!url.isEmpty()) |
4187 urls.push_back( | 4185 urls.push_back( |
4188 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4186 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4189 } | 4187 } |
4190 SendUpdateFaviconURL(urls); | 4188 SendUpdateFaviconURL(urls); |
4191 } | 4189 } |
4192 | 4190 |
4193 } // namespace content | 4191 } // namespace content |
OLD | NEW |