| OLD | NEW |
| 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 2373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2384 } | 2384 } |
| 2385 | 2385 |
| 2386 if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled)) | 2386 if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled)) |
| 2387 web_prefs->plugins_enabled = false; | 2387 web_prefs->plugins_enabled = false; |
| 2388 web_prefs->loads_images_automatically = | 2388 web_prefs->loads_images_automatically = |
| 2389 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically); | 2389 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically); |
| 2390 | 2390 |
| 2391 if (prefs->GetBoolean(prefs::kDisable3DAPIs)) | 2391 if (prefs->GetBoolean(prefs::kDisable3DAPIs)) |
| 2392 web_prefs->experimental_webgl_enabled = false; | 2392 web_prefs->experimental_webgl_enabled = false; |
| 2393 | 2393 |
| 2394 web_prefs->allow_displaying_insecure_content = | |
| 2395 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent); | |
| 2396 web_prefs->allow_running_insecure_content = | 2394 web_prefs->allow_running_insecure_content = |
| 2397 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); | 2395 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); |
| 2398 #if defined(OS_ANDROID) | 2396 #if defined(OS_ANDROID) |
| 2399 web_prefs->font_scale_factor = | 2397 web_prefs->font_scale_factor = |
| 2400 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); | 2398 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); |
| 2401 web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment(); | 2399 web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment(); |
| 2402 web_prefs->force_enable_zoom = | 2400 web_prefs->force_enable_zoom = |
| 2403 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); | 2401 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); |
| 2404 #endif | 2402 #endif |
| 2405 | 2403 |
| (...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3177 if (channel <= kMaxDisableEncryptionChannel) { | 3175 if (channel <= kMaxDisableEncryptionChannel) { |
| 3178 static const char* const kWebRtcDevSwitchNames[] = { | 3176 static const char* const kWebRtcDevSwitchNames[] = { |
| 3179 switches::kDisableWebRtcEncryption, | 3177 switches::kDisableWebRtcEncryption, |
| 3180 }; | 3178 }; |
| 3181 to_command_line->CopySwitchesFrom(from_command_line, | 3179 to_command_line->CopySwitchesFrom(from_command_line, |
| 3182 kWebRtcDevSwitchNames, | 3180 kWebRtcDevSwitchNames, |
| 3183 arraysize(kWebRtcDevSwitchNames)); | 3181 arraysize(kWebRtcDevSwitchNames)); |
| 3184 } | 3182 } |
| 3185 } | 3183 } |
| 3186 #endif // defined(ENABLE_WEBRTC) | 3184 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |