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

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

Issue 1530403002: Removal of geolocation APIs on insecure origins (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fix unit test Created 5 years 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 985 matching lines...) Expand 10 before | Expand all | Expand 10 after
996 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking); 996 settings->setStrictMixedContentChecking(prefs.strict_mixed_content_checking);
997 997
998 settings->setStrictlyBlockBlockableMixedContent( 998 settings->setStrictlyBlockBlockableMixedContent(
999 prefs.strictly_block_blockable_mixed_content); 999 prefs.strictly_block_blockable_mixed_content);
1000 1000
1001 settings->setStrictMixedContentCheckingForPlugin( 1001 settings->setStrictMixedContentCheckingForPlugin(
1002 prefs.block_mixed_plugin_content); 1002 prefs.block_mixed_plugin_content);
1003 1003
1004 settings->setStrictPowerfulFeatureRestrictions( 1004 settings->setStrictPowerfulFeatureRestrictions(
1005 prefs.strict_powerful_feature_restrictions); 1005 prefs.strict_powerful_feature_restrictions);
1006 settings->setAllowGeolocationOnInsecureOrigins(
1007 prefs.allow_geolocation_on_insecure_origins);
1006 settings->setPasswordEchoEnabled(prefs.password_echo_enabled); 1008 settings->setPasswordEchoEnabled(prefs.password_echo_enabled);
1007 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds); 1009 settings->setShouldPrintBackgrounds(prefs.should_print_backgrounds);
1008 settings->setShouldClearDocumentBackground( 1010 settings->setShouldClearDocumentBackground(
1009 prefs.should_clear_document_background); 1011 prefs.should_clear_document_background);
1010 settings->setEnableScrollAnimator(prefs.enable_scroll_animator); 1012 settings->setEnableScrollAnimator(prefs.enable_scroll_animator);
1011 1013
1012 WebRuntimeFeatures::enableTouch(prefs.touch_enabled); 1014 WebRuntimeFeatures::enableTouch(prefs.touch_enabled);
1013 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points); 1015 settings->setMaxTouchPoints(prefs.pointer_events_max_touch_points);
1014 settings->setAvailablePointerTypes(prefs.available_pointer_types); 1016 settings->setAvailablePointerTypes(prefs.available_pointer_types);
1015 settings->setPrimaryPointerType( 1017 settings->setPrimaryPointerType(
(...skipping 2709 matching lines...) Expand 10 before | Expand all | Expand 10 after
3725 if (IsUseZoomForDSFEnabled()) { 3727 if (IsUseZoomForDSFEnabled()) {
3726 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); 3728 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
3727 } else { 3729 } else {
3728 webview()->setDeviceScaleFactor(device_scale_factor_); 3730 webview()->setDeviceScaleFactor(device_scale_factor_);
3729 } 3731 }
3730 webview()->settings()->setPreferCompositingToLCDTextEnabled( 3732 webview()->settings()->setPreferCompositingToLCDTextEnabled(
3731 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 3733 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
3732 } 3734 }
3733 3735
3734 } // namespace content 3736 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698