Chromium Code Reviews| Index: chrome/browser/resources/settings/languages_page/manage_languages_page.html |
| diff --git a/chrome/browser/resources/settings/languages_page/manage_languages_page.html b/chrome/browser/resources/settings/languages_page/manage_languages_page.html |
| index 912a2ff8f91ecdcc05cf43241ffec785d01076d2..a7641eb7c3770fd5ac7fb7e2fe56bdd27c9141dd 100644 |
| --- a/chrome/browser/resources/settings/languages_page/manage_languages_page.html |
| +++ b/chrome/browser/resources/settings/languages_page/manage_languages_page.html |
| @@ -3,13 +3,11 @@ |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html"> |
| -<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.html"> |
| <link rel="import" href="chrome://resources/html/assert.html"> |
| <link rel="import" href="chrome://resources/html/cr.html"> |
| -<link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html"> |
| <link rel="import" href="languages.html"> |
| <dom-module id="cr-settings-manage-languages-page"> |
| @@ -24,9 +22,10 @@ |
| <div class="item-list"> |
| <template is="dom-repeat" items="{{languages.enabledLanguages}}"> |
| <paper-item> |
| - <div class="flex">[[item.language.displayName]]</div> |
| + <div class="flex" title="[[item.language.nativeDisplayName]]" |
| + >[[item.language.displayName]]</div> |
| <paper-icon-button icon="clear" on-tap="onRemoveLanguageTap_" |
| - hidden$="[[!canRemoveLanguage_(item.language.code, languages.enabledLanguages)]]"> |
| + hidden$="[[!canRemoveLanguage_(item.language.code, prefs.intl.app_locale.value)]]"> |
| </paper-icon-button> |
| </paper-item> |
| </template> |
| @@ -35,7 +34,10 @@ |
| <iron-list id="list" items="{{availableLanguages_}}" as="item"> |
| <template> |
| <paper-item on-tap="onAddLanguageTap_"> |
| - <div class="flex">[[item.displayName]]</div> |
| + <div class="flex"> |
|
stevenjb
2015/09/28 23:51:54
I thought we decided to avoid 'class="flex"'?
michaelpg
2015/09/29 00:20:32
Yes. Guess I may as well handle those while I'm he
|
| + <span>[[item.displayName]]</span> - |
| + <span>[[item.nativeDisplayName]]</span> |
| + </div> |
| <iron-icon icon="done" hidden$="[[!item.enabled]]"> |
| </iron-icon> |
| </paper-item> |