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 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1156 settings->setViewportMetaNonUserScalableQuirk( | 1156 settings->setViewportMetaNonUserScalableQuirk( |
1157 prefs.viewport_meta_non_user_scalable_quirk); | 1157 prefs.viewport_meta_non_user_scalable_quirk); |
1158 settings->setViewportMetaZeroValuesQuirk( | 1158 settings->setViewportMetaZeroValuesQuirk( |
1159 prefs.viewport_meta_zero_values_quirk); | 1159 prefs.viewport_meta_zero_values_quirk); |
1160 settings->setClobberUserAgentInitialScaleQuirk( | 1160 settings->setClobberUserAgentInitialScaleQuirk( |
1161 prefs.clobber_user_agent_initial_scale_quirk); | 1161 prefs.clobber_user_agent_initial_scale_quirk); |
1162 settings->setIgnoreMainFrameOverflowHiddenQuirk( | 1162 settings->setIgnoreMainFrameOverflowHiddenQuirk( |
1163 prefs.ignore_main_frame_overflow_hidden_quirk); | 1163 prefs.ignore_main_frame_overflow_hidden_quirk); |
1164 settings->setReportScreenSizeInPhysicalPixelsQuirk( | 1164 settings->setReportScreenSizeInPhysicalPixelsQuirk( |
1165 prefs.report_screen_size_in_physical_pixels_quirk); | 1165 prefs.report_screen_size_in_physical_pixels_quirk); |
| 1166 settings->setPreferHiddenVolumeControls(true); |
1166 | 1167 |
1167 bool record_full_layer = | 1168 bool record_full_layer = |
1168 RenderViewImpl::FromWebView(web_view) | 1169 RenderViewImpl::FromWebView(web_view) |
1169 ? RenderViewImpl::FromWebView(web_view)->DoesRecordFullLayer() | 1170 ? RenderViewImpl::FromWebView(web_view)->DoesRecordFullLayer() |
1170 : false; | 1171 : false; |
1171 settings->setMainFrameClipsContent(!record_full_layer); | 1172 settings->setMainFrameClipsContent(!record_full_layer); |
1172 | 1173 |
1173 settings->setShrinksViewportContentToFit(true); | 1174 settings->setShrinksViewportContentToFit(true); |
1174 settings->setUseMobileViewportStyle(true); | 1175 settings->setUseMobileViewportStyle(true); |
1175 #endif | 1176 #endif |
(...skipping 2651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3827 std::vector<gfx::Size> sizes; | 3828 std::vector<gfx::Size> sizes; |
3828 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3829 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
3829 if (!url.isEmpty()) | 3830 if (!url.isEmpty()) |
3830 urls.push_back( | 3831 urls.push_back( |
3831 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3832 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
3832 } | 3833 } |
3833 SendUpdateFaviconURL(urls); | 3834 SendUpdateFaviconURL(urls); |
3834 } | 3835 } |
3835 | 3836 |
3836 } // namespace content | 3837 } // namespace content |
OLD | NEW |