Chromium Code Reviews| 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 <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 2238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2249 web_prefs->allow_displaying_insecure_content = | 2249 web_prefs->allow_displaying_insecure_content = |
| 2250 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent); | 2250 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent); |
| 2251 web_prefs->allow_running_insecure_content = | 2251 web_prefs->allow_running_insecure_content = |
| 2252 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); | 2252 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); |
| 2253 #if defined(OS_ANDROID) | 2253 #if defined(OS_ANDROID) |
| 2254 web_prefs->font_scale_factor = | 2254 web_prefs->font_scale_factor = |
| 2255 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); | 2255 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); |
| 2256 web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment(); | 2256 web_prefs->device_scale_adjustment = GetDeviceScaleAdjustment(); |
| 2257 web_prefs->force_enable_zoom = | 2257 web_prefs->force_enable_zoom = |
| 2258 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); | 2258 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); |
| 2259 // Enables media autoplay to support audio playback for voice searches. | |
| 2260 // Disabled in VoiceSearchTabHelper. | |
| 2261 web_prefs->user_gesture_required_for_media_playback = | |
| 2262 !google_util::IsGoogleSearchUrl(url); | |
|
Ted C
2013/12/17 17:52:22
also, should this be checking against the voice se
apiccion
2013/12/17 18:53:37
https://codereview.chromium.org/106103006/
talked
| |
| 2259 #endif | 2263 #endif |
| 2260 | 2264 |
| 2261 #if defined(OS_ANDROID) | 2265 #if defined(OS_ANDROID) |
| 2262 web_prefs->password_echo_enabled = | 2266 web_prefs->password_echo_enabled = |
| 2263 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); | 2267 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); |
| 2264 #else | 2268 #else |
| 2265 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; | 2269 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; |
| 2266 #endif | 2270 #endif |
| 2267 | 2271 |
| 2268 web_prefs->asynchronous_spell_checking_enabled = true; | 2272 web_prefs->asynchronous_spell_checking_enabled = true; |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2661 | 2665 |
| 2662 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); | 2666 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
| 2663 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 2667 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
| 2664 #else | 2668 #else |
| 2665 return false; | 2669 return false; |
| 2666 #endif | 2670 #endif |
| 2667 } | 2671 } |
| 2668 | 2672 |
| 2669 | 2673 |
| 2670 } // namespace chrome | 2674 } // namespace chrome |
| OLD | NEW |