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

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

Issue 1411103011: Call setUseMobileViewportStyle before setViewportEnabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2526
Patch Set: Created 5 years, 1 month 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/content_tests.gypi ('k') | content/test/data/resource_loading/200.png » ('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 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 settings->setEditingBehavior( 1046 settings->setEditingBehavior(
1047 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); 1047 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior));
1048 1048
1049 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); 1049 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
1050 1050
1051 settings->setInertVisualViewport(prefs.inert_visual_viewport); 1051 settings->setInertVisualViewport(prefs.inert_visual_viewport);
1052 1052
1053 // TODO(bokan): Remove once Blink side is gone. 1053 // TODO(bokan): Remove once Blink side is gone.
1054 settings->setInvertViewportScrollOrder(true); 1054 settings->setInvertViewportScrollOrder(true);
1055 1055
1056 settings->setViewportEnabled(prefs.viewport_enabled);
1057 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
1058 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
1059 settings->setMainFrameResizesAreOrientationChanges(
1060 prefs.main_frame_resizes_are_orientation_changes);
1061
1062 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); 1056 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
1063 1057
1064 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); 1058 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled);
1065 1059
1066 settings->setSelectionIncludesAltImageText(true); 1060 settings->setSelectionIncludesAltImageText(true);
1067 1061
1068 settings->setV8CacheOptions( 1062 settings->setV8CacheOptions(
1069 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); 1063 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options));
1070 1064
1071 settings->setImageAnimationPolicy( 1065 settings->setImageAnimationPolicy(
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 settings->setReportScreenSizeInPhysicalPixelsQuirk( 1106 settings->setReportScreenSizeInPhysicalPixelsQuirk(
1113 prefs.report_screen_size_in_physical_pixels_quirk); 1107 prefs.report_screen_size_in_physical_pixels_quirk);
1114 settings->setPreferHiddenVolumeControls(true); 1108 settings->setPreferHiddenVolumeControls(true);
1115 settings->setMainFrameClipsContent(!prefs.record_whole_document); 1109 settings->setMainFrameClipsContent(!prefs.record_whole_document);
1116 settings->setShrinksViewportContentToFit(true); 1110 settings->setShrinksViewportContentToFit(true);
1117 settings->setUseMobileViewportStyle(true); 1111 settings->setUseMobileViewportStyle(true);
1118 settings->setAutoplayExperimentMode( 1112 settings->setAutoplayExperimentMode(
1119 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode)); 1113 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode));
1120 #endif 1114 #endif
1121 1115
1116 settings->setViewportEnabled(prefs.viewport_enabled);
1117 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
1118 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
1119 settings->setMainFrameResizesAreOrientationChanges(
1120 prefs.main_frame_resizes_are_orientation_changes);
1121
1122 WebNetworkStateNotifier::setOnLine(prefs.is_online); 1122 WebNetworkStateNotifier::setOnLine(prefs.is_online);
1123 WebNetworkStateNotifier::setWebConnection( 1123 WebNetworkStateNotifier::setWebConnection(
1124 NetConnectionTypeToWebConnectionType(prefs.net_info_connection_type), 1124 NetConnectionTypeToWebConnectionType(prefs.net_info_connection_type),
1125 prefs.net_info_max_bandwidth_mbps); 1125 prefs.net_info_max_bandwidth_mbps);
1126 1126
1127 settings->setPinchOverlayScrollbarThickness( 1127 settings->setPinchOverlayScrollbarThickness(
1128 prefs.pinch_overlay_scrollbar_thickness); 1128 prefs.pinch_overlay_scrollbar_thickness);
1129 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 1129 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
1130 1130
1131 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); 1131 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up);
(...skipping 2560 matching lines...) Expand 10 before | Expand all | Expand 10 after
3692 std::vector<gfx::Size> sizes; 3692 std::vector<gfx::Size> sizes;
3693 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3693 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3694 if (!url.isEmpty()) 3694 if (!url.isEmpty())
3695 urls.push_back( 3695 urls.push_back(
3696 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3696 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3697 } 3697 }
3698 SendUpdateFaviconURL(urls); 3698 SendUpdateFaviconURL(urls);
3699 } 3699 }
3700 3700
3701 } // namespace content 3701 } // namespace content
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/test/data/resource_loading/200.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698