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

Side by Side Diff: chrome/browser/resources/settings/languages_page/languages_page.html

Issue 2663083002: MD Settings: Migrate enable-translation toggle from non-MD settings page. (Closed)
Patch Set: fix tests Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/action_link.html"> 1 <link rel="import" href="chrome://resources/html/action_link.html">
2 <link rel="import" href="chrome://resources/html/action_link_css.html"> 2 <link rel="import" href="chrome://resources/html/action_link_css.html">
3 <link rel="import" href="chrome://resources/html/assert.html"> 3 <link rel="import" href="chrome://resources/html/assert.html">
4 <link rel="import" href="chrome://resources/html/cr.html"> 4 <link rel="import" href="chrome://resources/html/cr.html">
5 <link rel="import" href="chrome://resources/html/polymer.html"> 5 <link rel="import" href="chrome://resources/html/polymer.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
10 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> 10 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 <div class="secondary"> 80 <div class="secondary">
81 [[getProspectiveUILanguageName_(languages.prospectiveUILanguage)]] 81 [[getProspectiveUILanguageName_(languages.prospectiveUILanguage)]]
82 </div> 82 </div>
83 </if> 83 </if>
84 </div> 84 </div>
85 <cr-expand-button expanded="{{languagesOpened_}}" 85 <cr-expand-button expanded="{{languagesOpened_}}"
86 alt="$i18n{languagesExpandA11yLabel}"> 86 alt="$i18n{languagesExpandA11yLabel}">
87 </cr-expand-button> 87 </cr-expand-button>
88 </div> 88 </div>
89 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> 89 <iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]">
90 <span class="settings-box first"
91 hidden="[[isHelpTextHidden_(languages.enabled.*)]]">
92 <span>$i18n{orderLanguagesInstructions}</span>
93 <if expr="chromeos">
94 <a href="$i18n{languagesLearnMoreURL}" target="_blank">
95 $i18n{learnMore}
96 </a>
97 </if>
98 </span>
90 <div class="list-frame vertical-list"> 99 <div class="list-frame vertical-list">
91 <span class="list-item"
92 hidden="[[isHelpTextHidden_(languages.enabled.*)]]">
93 <span>$i18n{orderLanguagesInstructions}</span>
94 <if expr="chromeos">
95 <a href="$i18n{languagesLearnMoreURL}" target="_blank">
96 $i18n{learnMore}
97 </a>
98 </if>
99 </span>
100 <template is="dom-repeat" items="[[languages.enabled]]"> 100 <template is="dom-repeat" items="[[languages.enabled]]">
101 <div class$="list-item [[getLanguageItemClass_( 101 <div class$="list-item [[getLanguageItemClass_(
102 item.language.code, language.prospectiveUILanguage)]]"> 102 item.language.code, language.prospectiveUILanguage)]]">
103 <div class="start"> 103 <div class="start">
104 <div title="[[item.language.nativeDisplayName]]"> 104 <div title="[[item.language.nativeDisplayName]]">
105 [[item.language.displayName]] 105 [[item.language.displayName]]
106 </div> 106 </div>
107 <if expr="chromeos or is_win"> 107 <if expr="chromeos or is_win">
108 <div class="explain-selected" 108 <div class="explain-selected"
109 hidden="[[!isProspectiveUILanguage_( 109 hidden="[[!isProspectiveUILanguage_(
(...skipping 16 matching lines...) Expand all
126 </paper-icon-button> 126 </paper-icon-button>
127 </div> 127 </div>
128 </template> 128 </template>
129 <div class="list-item"> 129 <div class="list-item">
130 <a is="action-link" class="list-button" 130 <a is="action-link" class="list-button"
131 on-tap="onAddLanguagesTap_"> 131 on-tap="onAddLanguagesTap_">
132 $i18n{addLanguages} 132 $i18n{addLanguages}
133 </a> 133 </a>
134 </div> 134 </div>
135 </div> 135 </div>
136 <div class="settings-box first">
137 <settings-toggle-button id="offerTranslateOtherLangs" class="start"
138 pref="{{prefs.translate.enabled}}"
139 label="$i18n{offerToEnableTranslate}">
140 </settings-toggle-button>
141 </div>
136 </iron-collapse> 142 </iron-collapse>
137 <if expr="chromeos"> 143 <if expr="chromeos">
138 <div id="manageInputMethodsSubpageTrigger" 144 <div id="manageInputMethodsSubpageTrigger"
139 class="settings-box two-line" actionable 145 class="settings-box two-line" actionable
140 on-tap="toggleExpandButton_"> 146 on-tap="toggleExpandButton_">
141 <div class="start"> 147 <div class="start">
142 <div>$i18n{inputMethodsListTitle}</div> 148 <div>$i18n{inputMethodsListTitle}</div>
143 <div class="secondary"> 149 <div class="secondary">
144 [[getInputMethodName_(languages.inputMethods.currentId)]] 150 [[getInputMethodName_(languages.inputMethods.currentId)]]
145 </div> 151 </div>
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 </if> 291 </if>
286 </settings-animated-pages> 292 </settings-animated-pages>
287 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> 293 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp>
288 <settings-add-languages-dialog languages="{{languages}}" 294 <settings-add-languages-dialog languages="{{languages}}"
289 language-helper="[[languageHelper]]"> 295 language-helper="[[languageHelper]]">
290 </settings-add-languages-dialog> 296 </settings-add-languages-dialog>
291 </template> 297 </template>
292 </template> 298 </template>
293 <script src="languages_page.js"></script> 299 <script src="languages_page.js"></script>
294 </dom-module> 300 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698