| Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateOptions.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateOptions.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateOptions.java
|
| index 98a7ff17af98871092090bf21a5a5c944ebb2290..4c5c2d1c197808bb03f3c9995a5f8d5352641d44 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateOptions.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateOptions.java
|
| @@ -131,17 +131,11 @@ public class TranslateOptions {
|
| }
|
|
|
| public String sourceLanguageName() {
|
| - if (isValidLanguageCode(mSourceLanguageCode)) {
|
| - return mCodeToRepresentation.get(mSourceLanguageCode);
|
| - }
|
| - return "";
|
| + return getRepresentationFromCode(mSourceLanguageCode);
|
| }
|
|
|
| public String targetLanguageName() {
|
| - if (isValidLanguageCode(mTargetLanguageCode)) {
|
| - return mCodeToRepresentation.get(mTargetLanguageCode);
|
| - }
|
| - return "";
|
| + return getRepresentationFromCode(mTargetLanguageCode);
|
| }
|
|
|
| public String sourceLanguageCode() {
|
| @@ -232,6 +226,18 @@ public class TranslateOptions {
|
| return toggleState(ALWAYS_LANGUAGE, value);
|
| }
|
|
|
| + /**
|
| + * Gets the language's translated representation from a given language code.
|
| + * @param languageCode ISO code for the language
|
| + * @return The translated representation of the language, or "" if not found.
|
| + */
|
| + public String getRepresentationFromCode(String languageCode) {
|
| + if (isValidLanguageCode(languageCode)) {
|
| + return mCodeToRepresentation.get(languageCode);
|
| + }
|
| + return "";
|
| + }
|
| +
|
| private boolean toggleState(int element, boolean newValue) {
|
| if (!checkElementBoundaries(element)) return false;
|
|
|
|
|