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

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

Issue 2461113002: WebUI: Make settings-action-menu re-usable as cr-action-menu. (Closed)
Patch Set: getComputedStyle instead of util.js Created 4 years, 1 month 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/assert.html"> 1 <link rel="import" href="chrome://resources/html/assert.html">
2 <link rel="import" href="chrome://resources/html/cr.html"> 2 <link rel="import" href="chrome://resources/html/cr.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
8 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">
8 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 9 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
9 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.html"> 10 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.html">
10 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 11 <link rel="import" href="chrome://resources/cr_elements/icons.html">
11 <link rel="import" href="/languages_page/add_languages_dialog.html"> 12 <link rel="import" href="/languages_page/add_languages_dialog.html">
12 <link rel="import" href="/languages_page/languages.html"> 13 <link rel="import" href="/languages_page/languages.html">
13 <link rel="import" href="/lifetime_browser_proxy.html"> 14 <link rel="import" href="/lifetime_browser_proxy.html">
14 <link rel="import" href="/route.html"> 15 <link rel="import" href="/route.html">
15 <link rel="import" href="/settings_action_menu.html">
16 <link rel="import" href="/settings_page/settings_animated_pages.html"> 16 <link rel="import" href="/settings_page/settings_animated_pages.html">
17 <link rel="import" href="/settings_page/settings_subpage.html"> 17 <link rel="import" href="/settings_page/settings_subpage.html">
18 <link rel="import" href="/settings_shared_css.html"> 18 <link rel="import" href="/settings_shared_css.html">
19 19
20 <if expr="not is_macosx"> 20 <if expr="not is_macosx">
21 <link rel="import" href="edit_dictionary_page.html"> 21 <link rel="import" href="edit_dictionary_page.html">
22 </if> 22 </if>
23 23
24 <if expr="chromeos"> 24 <if expr="chromeos">
25 <link rel="import" href="chrome://resources/html/chromeos/ui_account_tweaks.html "> 25 <link rel="import" href="chrome://resources/html/chromeos/ui_account_tweaks.html ">
26 <link rel="import" href="/languages_page/manage_input_methods_page.html"> 26 <link rel="import" href="/languages_page/manage_input_methods_page.html">
27 </if> 27 </if>
28 28
29 <dom-module id="settings-languages-page"> 29 <dom-module id="settings-languages-page">
30 <template> 30 <template>
31 <style include="settings-shared"> 31 <style include="settings-shared">
32 #languagesCollapse .list-item.selected { 32 #languagesCollapse .list-item.selected {
33 min-height: var(--settings-row-two-line-min-height); 33 min-height: var(--settings-row-two-line-min-height);
34 } 34 }
35 35
36 .explain-selected { 36 .explain-selected {
37 color: var(--google-green-700); 37 color: var(--google-green-700);
38 font-weight: initial; 38 font-weight: initial;
39 margin-top: 4px; 39 margin-top: 4px;
40 } 40 }
41 41
42 dialog[is='settings-action-menu'].complex .dropdown-item { 42 dialog[is='cr-action-menu'].complex .dropdown-item {
43 min-height: 36px; 43 min-height: 36px;
44 } 44 }
45 45
46 dialog[is='settings-action-menu']:not(.complex) hr { 46 dialog[is='cr-action-menu']:not(.complex) hr {
47 display: none; 47 display: none;
48 } 48 }
49 49
50 dialog[is='settings-action-menu'].complex hr { 50 dialog[is='cr-action-menu'].complex hr {
51 /* Override user-agent border and margin. */ 51 /* Override user-agent border and margin. */
52 border: none; 52 border: none;
53 /* TODO(michaelpg): Update to whatever variable is used for the darker, 53 /* TODO(michaelpg): Update to whatever variable is used for the darker,
54 * full-width separators: crbug.com/649547. */ 54 * full-width separators: crbug.com/649547. */
55 border-top: var(--settings-separator-line); 55 border-top: var(--settings-separator-line);
56 margin: 6px 0 0 0; 56 margin: 6px 0 0 0;
57 } 57 }
58 58
59 paper-checkbox.dropdown-item { 59 paper-checkbox.dropdown-item {
60 --checkbox-margin-start: 0; 60 --checkbox-margin-start: 0;
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 </paper-checkbox> 186 </paper-checkbox>
187 </label> 187 </label>
188 </template> 188 </template>
189 <div class="list-item list-button" on-tap="onEditDictionaryTap_"> 189 <div class="list-item list-button" on-tap="onEditDictionaryTap_">
190 $i18n{manageSpellCheck} 190 $i18n{manageSpellCheck}
191 </div> 191 </div>
192 </div> 192 </div>
193 </iron-collapse> 193 </iron-collapse>
194 </if> 194 </if>
195 <template is="cr-lazy-render" id="menu"> 195 <template is="cr-lazy-render" id="menu">
196 <dialog is="settings-action-menu" 196 <dialog is="cr-action-menu"
197 class$="[[getMenuClass_(prefs.translate.enabled.value)]]"> 197 class$="[[getMenuClass_(prefs.translate.enabled.value)]]">
198 <if expr="chromeos or is_win"> 198 <if expr="chromeos or is_win">
199 <paper-checkbox id="uiLanguageItem" class="dropdown-item" 199 <paper-checkbox id="uiLanguageItem" class="dropdown-item"
200 checked="[[isProspectiveUILanguage_( 200 checked="[[isProspectiveUILanguage_(
201 detailLanguage_.language.code, 201 detailLanguage_.language.code,
202 prefs.intl.app_locale.value)]]" 202 prefs.intl.app_locale.value)]]"
203 on-change="onUILanguageChange_" 203 on-change="onUILanguageChange_"
204 disabled="[[disableUILanguageCheckbox_( 204 disabled="[[disableUILanguageCheckbox_(
205 detailLanguage_, prefs.intl.app_locale.value)]]"> 205 detailLanguage_, prefs.intl.app_locale.value)]]">
206 $i18n{displayInThisLanguage} 206 $i18n{displayInThisLanguage}
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 </if> 263 </if>
264 </settings-animated-pages> 264 </settings-animated-pages>
265 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp> 265 <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp>
266 <settings-add-languages-dialog languages="{{languages}}" 266 <settings-add-languages-dialog languages="{{languages}}"
267 language-helper="[[languageHelper]]"> 267 language-helper="[[languageHelper]]">
268 </settings-add-languages-dialog> 268 </settings-add-languages-dialog>
269 </template> 269 </template>
270 </template> 270 </template>
271 <script src="languages_page.js"></script> 271 <script src="languages_page.js"></script>
272 </dom-module> 272 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698