| 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 2391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2402 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); | 2402 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); |
| 2403 #endif | 2403 #endif |
| 2404 | 2404 |
| 2405 #if defined(OS_ANDROID) | 2405 #if defined(OS_ANDROID) |
| 2406 web_prefs->password_echo_enabled = | 2406 web_prefs->password_echo_enabled = |
| 2407 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); | 2407 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); |
| 2408 #else | 2408 #else |
| 2409 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; | 2409 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; |
| 2410 #endif | 2410 #endif |
| 2411 | 2411 |
| 2412 web_prefs->uses_universal_detector = true; // autodetection is always on. | |
| 2413 web_prefs->text_areas_are_resizable = | 2412 web_prefs->text_areas_are_resizable = |
| 2414 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); | 2413 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); |
| 2415 web_prefs->hyperlink_auditing_enabled = | 2414 web_prefs->hyperlink_auditing_enabled = |
| 2416 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); | 2415 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); |
| 2417 | 2416 |
| 2418 #if defined(ENABLE_EXTENSIONS) | 2417 #if defined(ENABLE_EXTENSIONS) |
| 2419 std::string image_animation_policy = | 2418 std::string image_animation_policy = |
| 2420 prefs->GetString(prefs::kAnimationPolicy); | 2419 prefs->GetString(prefs::kAnimationPolicy); |
| 2421 if (image_animation_policy == kAnimationPolicyOnce) | 2420 if (image_animation_policy == kAnimationPolicyOnce) |
| 2422 web_prefs->animation_policy = | 2421 web_prefs->animation_policy = |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3172 if (channel <= kMaxDisableEncryptionChannel) { | 3171 if (channel <= kMaxDisableEncryptionChannel) { |
| 3173 static const char* const kWebRtcDevSwitchNames[] = { | 3172 static const char* const kWebRtcDevSwitchNames[] = { |
| 3174 switches::kDisableWebRtcEncryption, | 3173 switches::kDisableWebRtcEncryption, |
| 3175 }; | 3174 }; |
| 3176 to_command_line->CopySwitchesFrom(from_command_line, | 3175 to_command_line->CopySwitchesFrom(from_command_line, |
| 3177 kWebRtcDevSwitchNames, | 3176 kWebRtcDevSwitchNames, |
| 3178 arraysize(kWebRtcDevSwitchNames)); | 3177 arraysize(kWebRtcDevSwitchNames)); |
| 3179 } | 3178 } |
| 3180 } | 3179 } |
| 3181 #endif // defined(ENABLE_WEBRTC) | 3180 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |