Chromium Code Reviews| Index: content/browser/speech/google_streaming_remote_engine.cc |
| diff --git a/content/browser/speech/google_streaming_remote_engine.cc b/content/browser/speech/google_streaming_remote_engine.cc |
| index b6b68d17ced6e56691ba4f45547aaf959477021e..5d854c4bed19ffe718751077f41b785a2e0bbe63 100644 |
| --- a/content/browser/speech/google_streaming_remote_engine.cc |
| +++ b/content/browser/speech/google_streaming_remote_engine.cc |
| @@ -21,6 +21,7 @@ |
| #include "google_apis/google_api_keys.h" |
| #include "net/base/escape.h" |
| #include "net/base/load_flags.h" |
| +#include "net/url_request/http_user_agent_settings.h" |
| #include "net/url_request/url_fetcher.h" |
| #include "net/url_request/url_request_context.h" |
| #include "net/url_request/url_request_context_getter.h" |
| @@ -560,10 +561,11 @@ std::string GoogleStreamingRemoteEngine::GetAcceptedLanguages() const { |
| net::URLRequestContext* request_context = |
| url_context_->GetURLRequestContext(); |
| DCHECK(request_context); |
| - // TODO(pauljensen): GoogleStreamingRemoteEngine should be constructed with |
| - // a reference to the HttpUserAgentSettings rather than accessing the |
| - // accept language through the URLRequestContext. |
|
pauljensen
2013/12/02 15:24:42
This comment should not be removed as the TODO has
Lei Zhang
2013/12/11 03:32:24
Done.
|
| - std::string accepted_language_list = request_context->GetAcceptLanguage(); |
| + std::string accepted_language_list; |
| + if (request_context->http_user_agent_settings()) { |
| + accepted_language_list = |
| + request_context->http_user_agent_settings()->GetAcceptLanguage(); |
| + } |
| size_t separator = accepted_language_list.find_first_of(",;"); |
| if (separator != std::string::npos) |
| langs = accepted_language_list.substr(0, separator); |