Index: chrome/browser/resources/settings/languages_page/languages_page.html |
diff --git a/chrome/browser/resources/settings/languages_page/languages_page.html b/chrome/browser/resources/settings/languages_page/languages_page.html |
index 10d87bd8a5e790dee7fded02812c1a400c21da16..927b4abb1b579c5474794828dbe186d089e56137 100644 |
--- a/chrome/browser/resources/settings/languages_page/languages_page.html |
+++ b/chrome/browser/resources/settings/languages_page/languages_page.html |
@@ -1,5 +1,6 @@ |
<link rel="import" href="chrome://resources/html/assert.html"> |
<link rel="import" href="chrome://resources/html/cr.html"> |
+<link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
<link rel="import" href="chrome://resources/html/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-collapse/iron-collapse.html"> |
@@ -9,7 +10,7 @@ |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> |
<link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html"> |
<link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html"> |
-<link rel="import" href="chrome://md-settings/settings_page/settings_subheader.html"> |
+<link rel="import" href="chrome://md-settings/settings_page/settings_subpage.html"> |
<link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
<link rel="import" href="language_detail_page.html"> |
<link rel="import" href="languages.html"> |
@@ -114,27 +115,26 @@ |
</iron-collapse> |
</if> |
</neon-animatable> |
- <neon-animatable id="manage-languages"> |
- <settings-subheader i18n-values="page-title:manageLanguagesPageTitle"> |
- </settings-subheader> |
- <settings-manage-languages-page |
- prefs="{{prefs}}"></settings-manage-languages-page> |
- </neon-animatable> |
- <neon-animatable id="language-detail"> |
- <settings-subheader id="language-detail-subheader" |
+ <template is="dom-if" name="manage-languages"> |
+ <settings-subpage page-title="[[i18n('manageLanguagesPageTitle')]]"> |
+ <settings-manage-languages-page |
+ prefs="{{prefs}}"></settings-manage-languages-page> |
+ </settings-subpage> |
+ </template> |
+ <template is="dom-if" name="language-detail"> |
+ <settings-subpage |
page-title="[[detailLanguage.language.displayName]]"> |
- </settings-subheader> |
- <settings-language-detail-page id="languageDetailPage" |
- prefs="{{prefs}}" detail="[[detailLanguage]]"> |
- </settings-language-detail-page> |
- </neon-animatable> |
+ <settings-language-detail-page id="languageDetailPage" |
+ prefs="{{prefs}}" detail="[[detailLanguage]]"> |
+ </settings-language-detail-page> |
+ </settings-subpage> |
+ </template> |
<if expr="not is_macosx"> |
- <neon-animatable id="edit-dictionary"> |
- <settings-subheader id="edit-dictionary-subheader" |
- i18n-values="page-title:editDictionaryPageTitle"> |
- </settings-subheader> |
- <settings-edit-dictionary-page></settings-edit-dictionary-page> |
- </neon-animatable> |
+ <template is="dom-if" name="edit-dictionary"> |
+ <settings-subpage page-title="[[i18n('editDictionaryPageTitle')]]"> |
+ <settings-edit-dictionary-page></settings-edit-dictionary-page> |
+ </settings-subpage> |
+ </template> |
</if> |
</settings-animated-pages> |
</template> |