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

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