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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Updated JNI mixed content settings getters for Android WebView Created 4 years, 3 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2368 matching lines...) Expand 10 before | Expand all | Expand 10 after
2379 } 2379 }
2380 2380
2381 if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled)) 2381 if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled))
2382 web_prefs->plugins_enabled = false; 2382 web_prefs->plugins_enabled = false;
2383 web_prefs->loads_images_automatically = 2383 web_prefs->loads_images_automatically =
2384 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically); 2384 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
2385 2385
2386 if (prefs->GetBoolean(prefs::kDisable3DAPIs)) 2386 if (prefs->GetBoolean(prefs::kDisable3DAPIs))
2387 web_prefs->experimental_webgl_enabled = false; 2387 web_prefs->experimental_webgl_enabled = false;
2388 2388
2389 web_prefs->allow_displaying_insecure_content =
2390 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent);
2391 web_prefs->allow_running_insecure_content = 2389 web_prefs->allow_running_insecure_content =
2392 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); 2390 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent);
2393 #if defined(OS_ANDROID) 2391 #if defined(OS_ANDROID)
2394 web_prefs->font_scale_factor = 2392 web_prefs->font_scale_factor =
2395 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); 2393 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor));
2396 web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment(); 2394 web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment();
2397 web_prefs->force_enable_zoom = 2395 web_prefs->force_enable_zoom =
2398 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); 2396 prefs->GetBoolean(prefs::kWebKitForceEnableZoom);
2399 #endif 2397 #endif
2400 2398
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
3150 if (channel <= kMaxDisableEncryptionChannel) { 3148 if (channel <= kMaxDisableEncryptionChannel) {
3151 static const char* const kWebRtcDevSwitchNames[] = { 3149 static const char* const kWebRtcDevSwitchNames[] = {
3152 switches::kDisableWebRtcEncryption, 3150 switches::kDisableWebRtcEncryption,
3153 }; 3151 };
3154 to_command_line->CopySwitchesFrom(from_command_line, 3152 to_command_line->CopySwitchesFrom(from_command_line,
3155 kWebRtcDevSwitchNames, 3153 kWebRtcDevSwitchNames,
3156 arraysize(kWebRtcDevSwitchNames)); 3154 arraysize(kWebRtcDevSwitchNames));
3157 } 3155 }
3158 } 3156 }
3159 #endif // defined(ENABLE_WEBRTC) 3157 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698