Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Side by Side Diff: android_webview/browser/net/aw_http_user_agent_settings.cc

Issue 2559243003: Extend with a language code in http accept languages
Patch Set: Rebased, fixed nits and handed over this CL :( Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/net/aw_http_user_agent_settings.h" 5 #include "android_webview/browser/net/aw_http_user_agent_settings.h"
6 6
7 #include "android_webview/browser/aw_content_browser_client.h" 7 #include "android_webview/browser/aw_content_browser_client.h"
8 #include "android_webview/common/aw_content_client.h" 8 #include "android_webview/common/aw_content_client.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "net/http/http_util.h" 10 #include "net/http/http_util.h"
11 #include "net/http/http_util_icu.h"
11 12
12 namespace android_webview { 13 namespace android_webview {
13 14
14 AwHttpUserAgentSettings::AwHttpUserAgentSettings() { 15 AwHttpUserAgentSettings::AwHttpUserAgentSettings() {
15 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 16 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
16 } 17 }
17 18
18 AwHttpUserAgentSettings::~AwHttpUserAgentSettings() { 19 AwHttpUserAgentSettings::~AwHttpUserAgentSettings() {
19 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 20 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
20 } 21 }
21 22
22 std::string AwHttpUserAgentSettings::GetAcceptLanguage() const { 23 std::string AwHttpUserAgentSettings::GetAcceptLanguage() const {
23 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 24 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
24 std::string new_aw_accept_language = 25 std::string new_aw_accept_language =
25 AwContentBrowserClient::GetAcceptLangsImpl(); 26 AwContentBrowserClient::GetAcceptLangsImpl();
26 if (new_aw_accept_language != last_aw_accept_language_) { 27 if (new_aw_accept_language != last_aw_accept_language_) {
27 last_http_accept_language_ = 28 last_http_accept_language_ =
28 net::HttpUtil::GenerateAcceptLanguageHeader(new_aw_accept_language); 29 net::http_util_icu::GenerateAcceptLanguageHeader(
30 new_aw_accept_language);
29 last_aw_accept_language_ = new_aw_accept_language; 31 last_aw_accept_language_ = new_aw_accept_language;
30 } 32 }
31 return last_http_accept_language_; 33 return last_http_accept_language_;
32 } 34 }
33 35
34 std::string AwHttpUserAgentSettings::GetUserAgent() const { 36 std::string AwHttpUserAgentSettings::GetUserAgent() const {
35 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 37 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
36 return android_webview::GetUserAgent(); 38 return android_webview::GetUserAgent();
37 } 39 }
38 40
39 } // namespace android_webview 41 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698