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 2141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2152 | 2152 |
2153 web_prefs->memory_info_enabled = | 2153 web_prefs->memory_info_enabled = |
2154 prefs->GetBoolean(prefs::kEnableMemoryInfo); | 2154 prefs->GetBoolean(prefs::kEnableMemoryInfo); |
2155 web_prefs->allow_displaying_insecure_content = | 2155 web_prefs->allow_displaying_insecure_content = |
2156 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent); | 2156 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent); |
2157 web_prefs->allow_running_insecure_content = | 2157 web_prefs->allow_running_insecure_content = |
2158 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); | 2158 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); |
2159 #if defined(OS_ANDROID) | 2159 #if defined(OS_ANDROID) |
2160 web_prefs->font_scale_factor = | 2160 web_prefs->font_scale_factor = |
2161 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); | 2161 static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)); |
| 2162 web_prefs->font_scale_factor_quirk = |
| 2163 prefs->GetBoolean(prefs::kWebKitFontScaleFactorQuirk); |
2162 web_prefs->force_enable_zoom = | 2164 web_prefs->force_enable_zoom = |
2163 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); | 2165 prefs->GetBoolean(prefs::kWebKitForceEnableZoom); |
2164 #endif | 2166 #endif |
2165 | 2167 |
2166 #if defined(OS_ANDROID) | 2168 #if defined(OS_ANDROID) |
2167 web_prefs->password_echo_enabled = | 2169 web_prefs->password_echo_enabled = |
2168 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); | 2170 prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled); |
2169 #else | 2171 #else |
2170 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; | 2172 web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; |
2171 #endif | 2173 #endif |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2572 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, | 2574 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, |
2573 allowed_file_handle_origins_) || | 2575 allowed_file_handle_origins_) || |
2574 IsHostAllowedByCommandLine(url, extension_set, | 2576 IsHostAllowedByCommandLine(url, extension_set, |
2575 switches::kAllowNaClFileHandleAPI); | 2577 switches::kAllowNaClFileHandleAPI); |
2576 #else | 2578 #else |
2577 return false; | 2579 return false; |
2578 #endif | 2580 #endif |
2579 } | 2581 } |
2580 | 2582 |
2581 } // namespace chrome | 2583 } // namespace chrome |
OLD | NEW |