| 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 2354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2365 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); | 2365 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); |
| 2366 #endif | 2366 #endif |
| 2367 | 2367 |
| 2368 #if defined(OS_ANDROID) | 2368 #if defined(OS_ANDROID) |
| 2369 web_prefs->password_echo_enabled = | 2369 web_prefs->password_echo_enabled = |
| 2370 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); | 2370 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); |
| 2371 #else | 2371 #else |
| 2372 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; | 2372 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; |
| 2373 #endif | 2373 #endif |
| 2374 | 2374 |
| 2375 web_prefs->unified_textchecker_enabled = true; | |
| 2376 | |
| 2377 web_prefs->uses_universal_detector = | 2375 web_prefs->uses_universal_detector = |
| 2378 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector); | 2376 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector); |
| 2379 web_prefs->text_areas_are_resizable = | 2377 web_prefs->text_areas_are_resizable = |
| 2380 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); | 2378 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); |
| 2381 web_prefs->hyperlink_auditing_enabled = | 2379 web_prefs->hyperlink_auditing_enabled = |
| 2382 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); | 2380 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); |
| 2383 | 2381 |
| 2384 #if defined(ENABLE_EXTENSIONS) | 2382 #if defined(ENABLE_EXTENSIONS) |
| 2385 std::string image_animation_policy = | 2383 std::string image_animation_policy = |
| 2386 prefs->GetString(prefs::kAnimationPolicy); | 2384 prefs->GetString(prefs::kAnimationPolicy); |
| (...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3054 if (channel <= kMaxDisableEncryptionChannel) { | 3052 if (channel <= kMaxDisableEncryptionChannel) { |
| 3055 static const char* const kWebRtcDevSwitchNames[] = { | 3053 static const char* const kWebRtcDevSwitchNames[] = { |
| 3056 switches::kDisableWebRtcEncryption, | 3054 switches::kDisableWebRtcEncryption, |
| 3057 }; | 3055 }; |
| 3058 to_command_line->CopySwitchesFrom(from_command_line, | 3056 to_command_line->CopySwitchesFrom(from_command_line, |
| 3059 kWebRtcDevSwitchNames, | 3057 kWebRtcDevSwitchNames, |
| 3060 arraysize(kWebRtcDevSwitchNames)); | 3058 arraysize(kWebRtcDevSwitchNames)); |
| 3061 } | 3059 } |
| 3062 } | 3060 } |
| 3063 #endif // defined(ENABLE_WEBRTC) | 3061 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |