| 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 f6c8cdb4fb25e623bfd708d7ab99cbec26679ddb..f13e5711cc9e2b9a90e0380d4a319393153f965f 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";
|
| }
|
|
|