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

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

Issue 418883002: Simplify wrap_contents mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix findbugs Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | 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 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 settings->setMediaPlaybackRequiresUserGesture( 1137 settings->setMediaPlaybackRequiresUserGesture(
1138 prefs.user_gesture_required_for_media_playback); 1138 prefs.user_gesture_required_for_media_playback);
1139 settings->setDefaultVideoPosterURL( 1139 settings->setDefaultVideoPosterURL(
1140 base::ASCIIToUTF16(prefs.default_video_poster_url.spec())); 1140 base::ASCIIToUTF16(prefs.default_video_poster_url.spec()));
1141 settings->setSupportDeprecatedTargetDensityDPI( 1141 settings->setSupportDeprecatedTargetDensityDPI(
1142 prefs.support_deprecated_target_density_dpi); 1142 prefs.support_deprecated_target_density_dpi);
1143 settings->setUseLegacyBackgroundSizeShorthandBehavior( 1143 settings->setUseLegacyBackgroundSizeShorthandBehavior(
1144 prefs.use_legacy_background_size_shorthand_behavior); 1144 prefs.use_legacy_background_size_shorthand_behavior);
1145 settings->setWideViewportQuirkEnabled(prefs.wide_viewport_quirk); 1145 settings->setWideViewportQuirkEnabled(prefs.wide_viewport_quirk);
1146 settings->setUseWideViewport(prefs.use_wide_viewport); 1146 settings->setUseWideViewport(prefs.use_wide_viewport);
1147 settings->setForceZeroLayoutHeight(prefs.force_zero_layout_height);
1147 settings->setViewportMetaLayoutSizeQuirk( 1148 settings->setViewportMetaLayoutSizeQuirk(
1148 prefs.viewport_meta_layout_size_quirk); 1149 prefs.viewport_meta_layout_size_quirk);
1149 settings->setViewportMetaMergeContentQuirk( 1150 settings->setViewportMetaMergeContentQuirk(
1150 prefs.viewport_meta_merge_content_quirk); 1151 prefs.viewport_meta_merge_content_quirk);
1151 settings->setViewportMetaNonUserScalableQuirk( 1152 settings->setViewportMetaNonUserScalableQuirk(
1152 prefs.viewport_meta_non_user_scalable_quirk); 1153 prefs.viewport_meta_non_user_scalable_quirk);
1153 settings->setViewportMetaZeroValuesQuirk( 1154 settings->setViewportMetaZeroValuesQuirk(
1154 prefs.viewport_meta_zero_values_quirk); 1155 prefs.viewport_meta_zero_values_quirk);
1155 settings->setClobberUserAgentInitialScaleQuirk( 1156 settings->setClobberUserAgentInitialScaleQuirk(
1156 prefs.clobber_user_agent_initial_scale_quirk); 1157 prefs.clobber_user_agent_initial_scale_quirk);
(...skipping 3155 matching lines...) Expand 10 before | Expand all | Expand 10 after
4312 std::vector<gfx::Size> sizes; 4313 std::vector<gfx::Size> sizes;
4313 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4314 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4314 if (!url.isEmpty()) 4315 if (!url.isEmpty())
4315 urls.push_back( 4316 urls.push_back(
4316 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4317 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4317 } 4318 }
4318 SendUpdateFaviconURL(urls); 4319 SendUpdateFaviconURL(urls);
4319 } 4320 }
4320 4321
4321 } // namespace content 4322 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698