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

Unified Diff: chrome/test/data/webui/settings/fake_language_settings_private.js

Issue 2261903002: Fix race condition in MD Settings Languages page causing inconsistent settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update histograms Created 4 years, 4 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/webui/settings/fake_language_settings_private.js
diff --git a/chrome/test/data/webui/settings/fake_language_settings_private.js b/chrome/test/data/webui/settings/fake_language_settings_private.js
index 5925e4ba739b5aefe8a713b53c7cb7ec846dd793..220cbfac13e9b4469ecbb8d74e3526b0cc3cc5c0 100644
--- a/chrome/test/data/webui/settings/fake_language_settings_private.js
+++ b/chrome/test/data/webui/settings/fake_language_settings_private.js
@@ -120,16 +120,42 @@ cr.define('settings', function() {
},
/**
- * Sets the accepted languages, used to decide which languages to translate,
- * generate the Accept-Language header, etc.
- * @param {!Array<string>} languageCodes
+ * Enables a language, adding it to the Accept-Language list (used to decide
+ * which languages to translate, generate the Accept-Language header, etc.).
+ * @param {string} languageCode
*/
- setLanguageList: function(languageCodes) {
- var languages = languageCodes.join(',');
- this.settingsPrefs_.set('prefs.intl.accept_languages.value', languages);
+ enableLanguage: function(languageCode) {
+ var languageCodes = this.settingsPrefs_.prefs.intl.accept_languages.value;
+ var languages = languageCodes.split(',');
+ if (languages.indexOf(languageCode) != -1)
+ return;
+ languages.push(languageCode);
+ languageCodes = languages.join(',');
+ this.settingsPrefs_.set(
+ 'prefs.intl.accept_languages.value', languageCodes);
+ if (cr.isChromeOS) {
+ this.settingsPrefs_.set(
+ 'prefs.settings.language.preferred_languages.value', languageCodes);
+ }
+ },
+
+ /**
+ * Disables a language, removing it from the Accept-Language list.
+ * @param {string} languageCode
+ */
+ disableLanguage: function(languageCode) {
+ var languageCodes = this.settingsPrefs_.prefs.intl.accept_languages.value;
+ var languages = languageCodes.split(',');
+ var index = languages.indexOf(languageCode);
+ if (index == -1)
+ return;
+ languages.splice(index, 1);
+ languageCodes = languages.join(',');
+ this.settingsPrefs_.set(
+ 'prefs.intl.accept_languages.value', languageCodes);
if (cr.isChromeOS) {
this.settingsPrefs_.set(
- 'prefs.settings.language.preferred_languages.value', languages);
+ 'prefs.settings.language.preferred_languages.value', languageCodes);
}
},
« no previous file with comments | « chrome/common/extensions/api/language_settings_private.idl ('k') | extensions/browser/extension_function_histogram_value.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698