| 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..8fa80eb0e91dfa4d7d099dd6c0eb025b52168317 100644
|
| --- a/chrome/browser/resources/settings/languages_page/manage_languages_page.html
|
| +++ b/chrome/browser/resources/settings/languages_page/manage_languages_page.html
|
| @@ -1,15 +1,12 @@
|
| <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html">
|
| <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 +21,11 @@
|
| <div class="item-list">
|
| <template is="dom-repeat" items="{{languages.enabledLanguages}}">
|
| <paper-item>
|
| - <div class="flex">[[item.language.displayName]]</div>
|
| + <div class="language-name"
|
| + 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="language-name">
|
| + <span>[[item.displayName]]</span> -
|
| + <span>[[item.nativeDisplayName]]</span>
|
| + </div>
|
| <iron-icon icon="done" hidden$="[[!item.enabled]]">
|
| </iron-icon>
|
| </paper-item>
|
|
|