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

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

Issue 1150663003: Remove --enable-region-based-columns command line flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/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 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas); 1006 settings->setDisableReadingFromCanvas(prefs.disable_reading_from_canvas);
1007 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); 1007 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking);
1008 settings->setStrictPowerfulFeatureRestrictions( 1008 settings->setStrictPowerfulFeatureRestrictions(
1009 prefs.strict_powerful_feature_restrictions); 1009 prefs.strict_powerful_feature_restrictions);
1010 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); 1010 settings->setPasswordEchoEnabled(prefs.password_echo_enabled);
1011 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); 1011 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds);
1012 settings->setShouldClearDocumentBackground( 1012 settings->setShouldClearDocumentBackground(
1013 prefs.should_clear_document_background); 1013 prefs.should_clear_document_background);
1014 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); 1014 settings->setEnableScrollAnimator(prefs.enable_scroll_animator);
1015 1015
1016 settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled);
1017
1018 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); 1016 WebRuntimeFeatures::enableTouch(prefs.touch_enabled);
1019 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); 1017 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points);
1020 settings->setAvailablePointerTypes(prefs.available_pointer_types); 1018 settings->setAvailablePointerTypes(prefs.available_pointer_types);
1021 settings->setPrimaryPointerType( 1019 settings->setPrimaryPointerType(
1022 static_cast<WebSettings::PointerType>(prefs.primary_pointer_type)); 1020 static_cast<WebSettings::PointerType>(prefs.primary_pointer_type));
1023 settings->setAvailableHoverTypes(prefs.available_hover_types); 1021 settings->setAvailableHoverTypes(prefs.available_hover_types);
1024 settings->setPrimaryHoverType( 1022 settings->setPrimaryHoverType(
1025 static_cast<WebSettings::HoverType>(prefs.primary_hover_type)); 1023 static_cast<WebSettings::HoverType>(prefs.primary_hover_type));
1026 settings->setDeviceSupportsTouch(prefs.device_supports_touch); 1024 settings->setDeviceSupportsTouch(prefs.device_supports_touch);
1027 settings->setDeviceSupportsMouse(prefs.device_supports_mouse); 1025 settings->setDeviceSupportsMouse(prefs.device_supports_mouse);
(...skipping 2733 matching lines...) Expand 10 before | Expand all | Expand 10 after
3761 std::vector<gfx::Size> sizes; 3759 std::vector<gfx::Size> sizes;
3762 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3760 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3763 if (!url.isEmpty()) 3761 if (!url.isEmpty())
3764 urls.push_back( 3762 urls.push_back(
3765 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3763 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3766 } 3764 }
3767 SendUpdateFaviconURL(urls); 3765 SendUpdateFaviconURL(urls);
3768 } 3766 }
3769 3767
3770 } // namespace content 3768 } // 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