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

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

Issue 1392213002: Call setUseMobileViewportStyle before setViewportEnabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added tests Created 5 years, 2 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
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 1032 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 settings->setEditingBehavior( 1043 settings->setEditingBehavior(
1044 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); 1044 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior));
1045 1045
1046 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); 1046 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
1047 1047
1048 settings->setInertVisualViewport(prefs.inert_visual_viewport); 1048 settings->setInertVisualViewport(prefs.inert_visual_viewport);
1049 1049
1050 // TODO(bokan): Remove once Blink side is gone. 1050 // TODO(bokan): Remove once Blink side is gone.
1051 settings->setInvertViewportScrollOrder(true); 1051 settings->setInvertViewportScrollOrder(true);
1052 1052
1053 settings->setViewportEnabled(prefs.viewport_enabled);
1054 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
1055 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
1056 settings->setMainFrameResizesAreOrientationChanges(
1057 prefs.main_frame_resizes_are_orientation_changes);
1058
1059 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); 1053 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
1060 1054
1061 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); 1055 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled);
1062 1056
1063 settings->setSelectionIncludesAltImageText(true); 1057 settings->setSelectionIncludesAltImageText(true);
1064 1058
1065 settings->setV8CacheOptions( 1059 settings->setV8CacheOptions(
1066 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); 1060 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options));
1067 1061
1068 settings->setImageAnimationPolicy( 1062 settings->setImageAnimationPolicy(
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
1109 settings->setReportScreenSizeInPhysicalPixelsQuirk( 1103 settings->setReportScreenSizeInPhysicalPixelsQuirk(
1110 prefs.report_screen_size_in_physical_pixels_quirk); 1104 prefs.report_screen_size_in_physical_pixels_quirk);
1111 settings->setPreferHiddenVolumeControls(true); 1105 settings->setPreferHiddenVolumeControls(true);
1112 settings->setMainFrameClipsContent(!prefs.record_whole_document); 1106 settings->setMainFrameClipsContent(!prefs.record_whole_document);
1113 settings->setShrinksViewportContentToFit(true); 1107 settings->setShrinksViewportContentToFit(true);
1114 settings->setUseMobileViewportStyle(true); 1108 settings->setUseMobileViewportStyle(true);
1115 settings->setAutoplayExperimentMode( 1109 settings->setAutoplayExperimentMode(
1116 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode)); 1110 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode));
1117 #endif 1111 #endif
1118 1112
1113 settings->setViewportEnabled(prefs.viewport_enabled);
1114 settings->setLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
1115 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
1116 settings->setMainFrameResizesAreOrientationChanges(
1117 prefs.main_frame_resizes_are_orientation_changes);
1118
1119 WebNetworkStateNotifier::setOnLine(prefs.is_online); 1119 WebNetworkStateNotifier::setOnLine(prefs.is_online);
1120 WebNetworkStateNotifier::setWebConnection( 1120 WebNetworkStateNotifier::setWebConnection(
1121 NetConnectionTypeToWebConnectionType(prefs.net_info_connection_type), 1121 NetConnectionTypeToWebConnectionType(prefs.net_info_connection_type),
1122 prefs.net_info_max_bandwidth_mbps); 1122 prefs.net_info_max_bandwidth_mbps);
1123 1123
1124 settings->setPinchOverlayScrollbarThickness( 1124 settings->setPinchOverlayScrollbarThickness(
1125 prefs.pinch_overlay_scrollbar_thickness); 1125 prefs.pinch_overlay_scrollbar_thickness);
1126 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 1126 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
1127 1127
1128 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up); 1128 settings->setShowContextMenuOnMouseUp(prefs.context_menu_on_mouse_up);
(...skipping 2553 matching lines...) Expand 10 before | Expand all | Expand 10 after
3682 std::vector<gfx::Size> sizes; 3682 std::vector<gfx::Size> sizes;
3683 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3683 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3684 if (!url.isEmpty()) 3684 if (!url.isEmpty())
3685 urls.push_back( 3685 urls.push_back(
3686 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3686 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3687 } 3687 }
3688 SendUpdateFaviconURL(urls); 3688 SendUpdateFaviconURL(urls);
3689 } 3689 }
3690 3690
3691 } // namespace content 3691 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698