Commit 8ddc67c4 authored by Joerg Bornemann's avatar Joerg Bornemann
Browse files

set Accept-Language in content::RendererPreferences

This amends commit 2a56ec7c

.

Change-Id: I8103197f08c985557000de36c37ad80e1ceadf24
Reviewed-by: default avatarKai Koehne <kai.koehne@theqtcompany.com>
Showing with 14 additions and 0 deletions
...@@ -54,6 +54,8 @@ ...@@ -54,6 +54,8 @@
#include <QStringBuilder> #include <QStringBuilder>
#include <QStandardPaths> #include <QStandardPaths>
#include <numeric>
namespace { namespace {
inline QString buildLocationFromStandardPath(const QString &standardPath, const QString &name) { inline QString buildLocationFromStandardPath(const QString &standardPath, const QString &name) {
QString location = standardPath; QString location = standardPath;
...@@ -368,6 +370,16 @@ void BrowserContextAdapter::permissionRequestReply(const QUrl &origin, Permissio ...@@ -368,6 +370,16 @@ void BrowserContextAdapter::permissionRequestReply(const QUrl &origin, Permissio
static_cast<PermissionManagerQt*>(browserContext()->GetPermissionManager())->permissionRequestReply(origin, type, reply); static_cast<PermissionManagerQt*>(browserContext()->GetPermissionManager())->permissionRequestReply(origin, type, reply);
} }
QString BrowserContextAdapter::httpAcceptLanguageWithoutQualities() const
{
const QStringList list = m_httpAcceptLanguage.split(QLatin1Char(','));
return std::accumulate(list.constBegin(), list.constEnd(), QString(),
[](const QString &r, const QString &e) {
return (r.isEmpty() ? r : r + QString(QLatin1Char(',')))
+ e.split(QLatin1Char(';')).first();
});
}
QString BrowserContextAdapter::httpAcceptLanguage() const QString BrowserContextAdapter::httpAcceptLanguage() const
{ {
return m_httpAcceptLanguage; return m_httpAcceptLanguage;
......
...@@ -151,6 +151,7 @@ public: ...@@ -151,6 +151,7 @@ public:
void permissionRequestReply(const QUrl &origin, PermissionType type, bool reply); void permissionRequestReply(const QUrl &origin, PermissionType type, bool reply);
QString httpAcceptLanguageWithoutQualities() const;
QString httpAcceptLanguage() const; QString httpAcceptLanguage() const;
void setHttpAcceptLanguage(const QString &httpAcceptLanguage); void setHttpAcceptLanguage(const QString &httpAcceptLanguage);
......
...@@ -377,6 +377,7 @@ void WebContentsAdapter::initialize(WebContentsAdapterClient *adapterClient) ...@@ -377,6 +377,7 @@ void WebContentsAdapter::initialize(WebContentsAdapterClient *adapterClient)
const int qtCursorFlashTime = QGuiApplication::styleHints()->cursorFlashTime(); const int qtCursorFlashTime = QGuiApplication::styleHints()->cursorFlashTime();
rendererPrefs->caret_blink_interval = 0.5 * static_cast<double>(qtCursorFlashTime) / 1000; rendererPrefs->caret_blink_interval = 0.5 * static_cast<double>(qtCursorFlashTime) / 1000;
rendererPrefs->user_agent_override = d->browserContextAdapter->httpUserAgent().toStdString(); rendererPrefs->user_agent_override = d->browserContextAdapter->httpUserAgent().toStdString();
rendererPrefs->accept_languages = d->browserContextAdapter->httpAcceptLanguageWithoutQualities().toStdString();
d->webContents->GetRenderViewHost()->SyncRendererPrefs(); d->webContents->GetRenderViewHost()->SyncRendererPrefs();
// Create and attach observers to the WebContents. // Create and attach observers to the WebContents.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment