Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 989963002: Trigger use of viewportAndroid.css through new setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 prefs.report_screen_size_in_physical_pixels_quirk); 1103 prefs.report_screen_size_in_physical_pixels_quirk);
1104 1104
1105 bool record_full_layer = 1105 bool record_full_layer =
1106 RenderViewImpl::FromWebView(web_view) 1106 RenderViewImpl::FromWebView(web_view)
1107 ? RenderViewImpl::FromWebView(web_view)->DoesRecordFullLayer() 1107 ? RenderViewImpl::FromWebView(web_view)->DoesRecordFullLayer()
1108 : false; 1108 : false;
1109 settings->setMainFrameClipsContent(!record_full_layer); 1109 settings->setMainFrameClipsContent(!record_full_layer);
1110 1110
1111 settings->setShrinksStandaloneImagesToFit(false); 1111 settings->setShrinksStandaloneImagesToFit(false);
1112 settings->setShrinksViewportContentToFit(true); 1112 settings->setShrinksViewportContentToFit(true);
1113 settings->setUseMobileViewportStyle(true);
1113 #endif 1114 #endif
1114 1115
1115 WebNetworkStateNotifier::setOnLine(prefs.is_online); 1116 WebNetworkStateNotifier::setOnLine(prefs.is_online);
1116 WebNetworkStateNotifier::setWebConnectionType( 1117 WebNetworkStateNotifier::setWebConnectionType(
1117 NetConnectionTypeToWebConnectionType(prefs.connection_type)); 1118 NetConnectionTypeToWebConnectionType(prefs.connection_type));
1118 settings->setPinchVirtualViewportEnabled( 1119 settings->setPinchVirtualViewportEnabled(
1119 prefs.pinch_virtual_viewport_enabled); 1120 prefs.pinch_virtual_viewport_enabled);
1120 1121
1121 settings->setPinchOverlayScrollbarThickness( 1122 settings->setPinchOverlayScrollbarThickness(
1122 prefs.pinch_overlay_scrollbar_thickness); 1123 prefs.pinch_overlay_scrollbar_thickness);
(...skipping 2878 matching lines...) Expand 10 before | Expand all | Expand 10 after
4001 std::vector<gfx::Size> sizes; 4002 std::vector<gfx::Size> sizes;
4002 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4003 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4003 if (!url.isEmpty()) 4004 if (!url.isEmpty())
4004 urls.push_back( 4005 urls.push_back(
4005 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4006 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4006 } 4007 }
4007 SendUpdateFaviconURL(urls); 4008 SendUpdateFaviconURL(urls);
4008 } 4009 }
4009 4010
4010 } // namespace content 4011 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698