Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 186cff883f07022662cb61adbd6f8f5e6e27fc42..784311d13abe63da1817790cf9e8c42e5f05a350 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -1303,7 +1303,7 @@ bool ChromeContentBrowserClient::ShouldAssignSiteForURL(const GURL& url) { |
std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName( |
msw
2016/08/23 23:10:55
In a follow-up CL (shouldn't block this CL), it'd
Jinsuk Kim
2016/08/24 08:23:42
Left a TODO for a follow-up.
|
const std::string& alias_name) { |
- return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name); |
+ return ::GetCanonicalEncodingNameByAliasName(alias_name); |
} |
namespace { |
@@ -2372,8 +2372,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs( |
web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled; |
#endif |
- web_prefs->uses_universal_detector = |
- prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector); |
+ web_prefs->uses_universal_detector = true; // autodetection is always on. |
web_prefs->text_areas_are_resizable = |
prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); |
web_prefs->hyperlink_auditing_enabled = |
@@ -2392,8 +2391,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs( |
#endif |
// Make sure we will set the default_encoding with canonical encoding name. |
- web_prefs->default_encoding = |
- CharacterEncoding::GetCanonicalEncodingNameByAliasName( |
+ web_prefs->default_encoding = GetCanonicalEncodingNameByAliasName( |
web_prefs->default_encoding); |
if (web_prefs->default_encoding.empty()) { |
prefs->ClearPref(prefs::kDefaultCharset); |