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

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

Issue 1306423004: [NetInfo] Browser changes to support connection.downlinkMax (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor browser test fix Created 5 years, 3 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 | « content/renderer/render_thread_impl.cc ('k') | content/test/data/net_info.html » ('j') | 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 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 prefs.ignore_main_frame_overflow_hidden_quirk); 1112 prefs.ignore_main_frame_overflow_hidden_quirk);
1113 settings->setReportScreenSizeInPhysicalPixelsQuirk( 1113 settings->setReportScreenSizeInPhysicalPixelsQuirk(
1114 prefs.report_screen_size_in_physical_pixels_quirk); 1114 prefs.report_screen_size_in_physical_pixels_quirk);
1115 settings->setPreferHiddenVolumeControls(true); 1115 settings->setPreferHiddenVolumeControls(true);
1116 settings->setMainFrameClipsContent(!prefs.record_whole_document); 1116 settings->setMainFrameClipsContent(!prefs.record_whole_document);
1117 settings->setShrinksViewportContentToFit(true); 1117 settings->setShrinksViewportContentToFit(true);
1118 settings->setUseMobileViewportStyle(true); 1118 settings->setUseMobileViewportStyle(true);
1119 #endif 1119 #endif
1120 1120
1121 WebNetworkStateNotifier::setOnLine(prefs.is_online); 1121 WebNetworkStateNotifier::setOnLine(prefs.is_online);
1122 WebNetworkStateNotifier::setWebConnectionType( 1122 WebNetworkStateNotifier::setWebConnection(
1123 NetConnectionTypeToWebConnectionType(prefs.connection_type)); 1123 NetConnectionTypeToWebConnectionType(prefs.net_info_connection_type),
1124 prefs.net_info_max_bandwidth_mbps);
1124 1125
1125 settings->setPinchOverlayScrollbarThickness( 1126 settings->setPinchOverlayScrollbarThickness(
1126 prefs.pinch_overlay_scrollbar_thickness); 1127 prefs.pinch_overlay_scrollbar_thickness);
1127 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 1128 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
1128 1129
1129 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); 1130 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up);
1130 1131
1131 #if defined(OS_MACOSX) 1132 #if defined(OS_MACOSX)
1132 settings->setDoubleTapToZoomEnabled(true); 1133 settings->setDoubleTapToZoomEnabled(true);
1133 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor); 1134 web_view->setMaximumLegibleScale(prefs.default_maximum_page_scale_factor);
(...skipping 2649 matching lines...) Expand 10 before | Expand all | Expand 10 after
3783 std::vector<gfx::Size> sizes; 3784 std::vector<gfx::Size> sizes;
3784 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3785 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3785 if (!url.isEmpty()) 3786 if (!url.isEmpty())
3786 urls.push_back( 3787 urls.push_back(
3787 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3788 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3788 } 3789 }
3789 SendUpdateFaviconURL(urls); 3790 SendUpdateFaviconURL(urls);
3790 } 3791 }
3791 3792
3792 } // namespace content 3793 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/test/data/net_info.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698