Merge ~osomon/oxide:navigator.languages-2 into oxide:master

[Olivier Tilloy]

Ensure that navigator.languages is not empty by propagating the value of UserAgentSettings.acceptLangs.

LP: #1620528

[Chris Coulson (chrisccoulson)]

This looks ok. Would you mind updating the documentation for WebContext::acceptLangs though? It currently only mentions the HTTP Accept-Language header (remember that navigator.languages reflects the value of this property directly, whereas it's used to generate another string for the Accept-Language header).

review: Needs Fixing

20ffa23... by Olivier Tilloy on 2016-10-05

Updated QML documentation for WebContext::acceptLangs.

diff --git a/qt/quick/api/oxideqquickwebcontext.cc b/qt/quick/api/oxideqquickwebcontext.cc
index ed733f9..6fe1ef7 100644
--- a/qt/quick/api/oxideqquickwebcontext.cc
+++ b/qt/quick/api/oxideqquickwebcontext.cc
@@ -721,7 +721,8 @@ void OxideQQuickWebContext::setCachePath(const QUrl& cacheUrl) {
 /*!
 \qmlproperty string WebContext::acceptLangs
 
-The value used to determine the contents of the HTTP \e{Accept-Language} header.
+The value used to determine the contents of \e{navigator.languages} and of the
+HTTP \e{Accept-Language} header.
 
 Applications can specify this by setting it to a comma delimited list of
 language codes in order of preference (starting with the most-preferred). Oxide
diff --git a/qt/tests/qmltests/web_platform/tst_navigator_languages.qml b/qt/tests/qmltests/web_platform/tst_navigator_languages.qml
new file mode 100644
index 0000000..b8d6ae2
--- /dev/null
+++ b/qt/tests/qmltests/web_platform/tst_navigator_languages.qml
@@ -0,0 +1,50 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.0
+import Oxide.testsupport 1.0
+
+TestWebView {
+  id: webView
+  focus: true
+
+  property int languageChangeEvents: 0
+
+  messageHandlers: [
+    ScriptMessageHandler {
+      msgId: "LANGUAGE-CHANGE"
+      contexts: [ "oxide://testutils/" ]
+      callback: function(msg) {
+        languageChangeEvents++;
+      }
+    }
+  ]
+
+  TestCase {
+    name: "navigator.languages"
+    when: windowShown
+
+    function get_navigator_languages() {
+      return webView.getTestApi().evaluateCode("navigator.languages;");
+    }
+
+    function initTestCase() {
+      webView.url = "http://testsuite/empty.html";
+      verify(webView.waitForLoadSucceeded());
+      verify(get_navigator_languages().length > 0);
+    }
+
+    function init() {
+      webView.languageChangeEvents = 0;
+    }
+
+    function test_accept_langs() {
+      webView.getTestApi().evaluateCode(
+          "window.addEventListener(\"languagechange\", function(event) {
+             oxide.sendMessage(\"LANGUAGE-CHANGE\");
+           });", true);
+      SingletonTestWebContext.acceptLangs = "fr,es,ca";
+      compare(get_navigator_languages(), ["fr", "es", "ca"]);
+      tryCompare(webView, "languageChangeEvents", 1);
+    }
+  }
+}
diff --git a/shared/browser/oxide_user_agent_settings.cc b/shared/browser/oxide_user_agent_settings.cc
index 2ff72e2..877dc31 100644
--- a/shared/browser/oxide_user_agent_settings.cc
+++ b/shared/browser/oxide_user_agent_settings.cc
@@ -267,6 +267,10 @@ void UserAgentSettings::SetAcceptLangs(const std::string& accept_langs) {
       context_->GetIOData()->GetUserAgentSettings();
   base::AutoLock lock(io_data->lock_);
   io_data->accept_langs_ = accept_langs;
+
+  FOR_EACH_OBSERVER(UserAgentSettingsObserver,
+                    observers_,
+                    NotifyAcceptLanguagesChanged());
 }
 
 std::vector<UserAgentSettings::UserAgentOverride>
diff --git a/shared/browser/oxide_user_agent_settings_observer.h b/shared/browser/oxide_user_agent_settings_observer.h
index d5cc154..9cdc045 100644
--- a/shared/browser/oxide_user_agent_settings_observer.h
+++ b/shared/browser/oxide_user_agent_settings_observer.h
@@ -30,6 +30,8 @@ class UserAgentSettingsObserver {
 
   virtual void NotifyDoNotTrackChanged() {}
 
+  virtual void NotifyAcceptLanguagesChanged() {}
+
  protected:
   UserAgentSettingsObserver();
   UserAgentSettingsObserver(UserAgentSettings* settings);
diff --git a/shared/browser/web_contents_helper.cc b/shared/browser/web_contents_helper.cc
index 7e71ecb..b19a4e8 100644
--- a/shared/browser/web_contents_helper.cc
+++ b/shared/browser/web_contents_helper.cc
@@ -60,8 +60,10 @@ WebContentsHelper::WebContentsHelper(content::WebContents* contents)
 
   content::RendererPreferences* renderer_prefs =
       web_contents_->GetMutableRendererPrefs();
-  renderer_prefs->enable_do_not_track =
-      UserAgentSettings::Get(contents->GetBrowserContext())->GetDoNotTrack();
+  UserAgentSettings* ua_settings =
+      UserAgentSettings::Get(contents->GetBrowserContext());
+  renderer_prefs->enable_do_not_track = ua_settings->GetDoNotTrack();
+  renderer_prefs->accept_languages = ua_settings->GetAcceptLangs();
 
   // Hardcoded selection colors to match the current Ambiance theme from the
   // Ubuntu UI Toolkit (https://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml)
@@ -102,6 +104,16 @@ void WebContentsHelper::NotifyDoNotTrackChanged() {
   SyncRendererPreferences();
 }
 
+void WebContentsHelper::NotifyAcceptLanguagesChanged() {
+  content::RendererPreferences* renderer_prefs =
+      web_contents_->GetMutableRendererPrefs();
+  UserAgentSettings* ua_settings =
+      UserAgentSettings::Get(web_contents_->GetBrowserContext());
+  renderer_prefs->accept_languages = ua_settings->GetAcceptLangs();
+
+  SyncRendererPreferences();
+}
+
 void WebContentsHelper::OnDisplayPropertiesChanged(
     const display::Display& display) {
   if (display.id() !=
diff --git a/shared/browser/web_contents_helper.h b/shared/browser/web_contents_helper.h
index c40d69e..9c46fb3 100644
--- a/shared/browser/web_contents_helper.h
+++ b/shared/browser/web_contents_helper.h
@@ -82,6 +82,7 @@ class OXIDE_SHARED_EXPORT WebContentsHelper
   // UserAgentSettingsObserver implementation
   void NotifyPopupBlockerEnabledChanged() override;
   void NotifyDoNotTrackChanged() override;
+  void NotifyAcceptLanguagesChanged() override;
 
   content::WebContents* web_contents_;