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 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1154 prefs.viewport_meta_non_user_scalable_quirk); | 1154 prefs.viewport_meta_non_user_scalable_quirk); |
1155 settings->setViewportMetaZeroValuesQuirk( | 1155 settings->setViewportMetaZeroValuesQuirk( |
1156 prefs.viewport_meta_zero_values_quirk); | 1156 prefs.viewport_meta_zero_values_quirk); |
1157 settings->setClobberUserAgentInitialScaleQuirk( | 1157 settings->setClobberUserAgentInitialScaleQuirk( |
1158 prefs.clobber_user_agent_initial_scale_quirk); | 1158 prefs.clobber_user_agent_initial_scale_quirk); |
1159 settings->setIgnoreMainFrameOverflowHiddenQuirk( | 1159 settings->setIgnoreMainFrameOverflowHiddenQuirk( |
1160 prefs.ignore_main_frame_overflow_hidden_quirk); | 1160 prefs.ignore_main_frame_overflow_hidden_quirk); |
1161 settings->setReportScreenSizeInPhysicalPixelsQuirk( | 1161 settings->setReportScreenSizeInPhysicalPixelsQuirk( |
1162 prefs.report_screen_size_in_physical_pixels_quirk); | 1162 prefs.report_screen_size_in_physical_pixels_quirk); |
1163 | 1163 |
1164 // The following two lines enable the M46 media playback UI. | |
1165 WebRuntimeFeatures::enableNewMediaPlaybackUi(true); | |
jochen (gone - plz use gerrit)
2015/08/06 07:44:25
this should go into content/child/runtime_features
liberato (no reviews please)
2015/08/06 14:09:39
Done.
| |
1166 settings->setPreferHiddenVolumeControls(true); | |
1167 | |
1164 bool record_full_layer = | 1168 bool record_full_layer = |
1165 RenderViewImpl::FromWebView(web_view) | 1169 RenderViewImpl::FromWebView(web_view) |
1166 ? RenderViewImpl::FromWebView(web_view)->DoesRecordFullLayer() | 1170 ? RenderViewImpl::FromWebView(web_view)->DoesRecordFullLayer() |
1167 : false; | 1171 : false; |
1168 settings->setMainFrameClipsContent(!record_full_layer); | 1172 settings->setMainFrameClipsContent(!record_full_layer); |
1169 | 1173 |
1170 settings->setShrinksViewportContentToFit(true); | 1174 settings->setShrinksViewportContentToFit(true); |
1171 settings->setUseMobileViewportStyle(true); | 1175 settings->setUseMobileViewportStyle(true); |
1172 #endif | 1176 #endif |
1173 | 1177 |
(...skipping 2642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3816 std::vector<gfx::Size> sizes; | 3820 std::vector<gfx::Size> sizes; |
3817 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3821 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
3818 if (!url.isEmpty()) | 3822 if (!url.isEmpty()) |
3819 urls.push_back( | 3823 urls.push_back( |
3820 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3824 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
3821 } | 3825 } |
3822 SendUpdateFaviconURL(urls); | 3826 SendUpdateFaviconURL(urls); |
3823 } | 3827 } |
3824 | 3828 |
3825 } // namespace content | 3829 } // namespace content |
OLD | NEW |