| Index: content/public/browser/content_browser_client.cc
|
| diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
|
| index 6db33e99e8c3a883ebad7a056c540d8683e3b755..a4cf01c86c88d4a30f8230bb0d00c1c050cf3224 100644
|
| --- a/content/public/browser/content_browser_client.cc
|
| +++ b/content/public/browser/content_browser_client.cc
|
| @@ -128,11 +128,6 @@ bool ContentBrowserClient::ShouldAssignSiteForURL(const GURL& url) {
|
| return true;
|
| }
|
|
|
| -std::string ContentBrowserClient::GetCanonicalEncodingNameByAliasName(
|
| - const std::string& alias_name) {
|
| - return std::string();
|
| -}
|
| -
|
| std::string ContentBrowserClient::GetApplicationLocale() {
|
| return "en-US";
|
| }
|
|
|