diff options
| -rw-r--r-- | net/url_request/url_request_context.h | 8 | ||||
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h index 14678e0..06fcadf 100644 --- a/net/url_request/url_request_context.h +++ b/net/url_request/url_request_context.h @@ -139,13 +139,11 @@ class URLRequestContext // Gets the value of 'Accept-Charset' header field. const std::string& accept_charset() const { return accept_charset_; } -#ifdef ANDROID - // Gets the value of 'Accept-Language' header field. - virtual const std::string& GetAcceptLanguage() const { return accept_language_; } -#else // Gets the value of 'Accept-Language' header field. - const std::string& accept_language() const { return accept_language_; } +#ifdef ANDROID + virtual #endif + const std::string& accept_language() const { return accept_language_; } // Gets the UA string to use for the given URL. Pass an invalid URL (such as // GURL()) to get the default UA string. Subclasses should override this diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 95ce1db..de51284 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -298,11 +298,7 @@ void URLRequestHttpJob::AddExtraHeaders() { // didn't have them specified. request_info_.extra_headers.SetHeaderIfMissing( HttpRequestHeaders::kAcceptLanguage, -#ifdef ANDROID - context->GetAcceptLanguage()); -#else context->accept_language()); -#endif request_info_.extra_headers.SetHeaderIfMissing( HttpRequestHeaders::kAcceptCharset, context->accept_charset()); |