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

Side by Side Diff: chrome/browser/resources/settings/controls/settings_toggle_button.html

Issue 2668803003: MD Settings: Fix Learn More link on Google Hotword in ChromeOS (Closed)
Patch Set: merge 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/search_page/search_page.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
3 <link rel="import" href="/controls/settings_boolean_control_behavior.html"> 3 <link rel="import" href="/controls/settings_boolean_control_behavior.html">
4 <link rel="import" href="/settings_shared_css.html"> 4 <link rel="import" href="/settings_shared_css.html">
5 5
6 <dom-module id="settings-toggle-button"> 6 <dom-module id="settings-toggle-button">
7 <template> 7 <template>
8 <style include="settings-shared"> 8 <style include="settings-shared">
9 :host([elide-label]), 9 :host([elide-label]),
10 :host([elide-label]) #outerRow, 10 :host([elide-label]) #outerRow,
(...skipping 21 matching lines...) Expand all
32 -webkit-margin-start: var(--checkbox-spacing); 32 -webkit-margin-start: var(--checkbox-spacing);
33 } 33 }
34 34
35 ::content .more-actions { 35 ::content .more-actions {
36 -webkit-margin-end: 10px; 36 -webkit-margin-end: 10px;
37 } 37 }
38 </style> 38 </style>
39 <div id="outerRow" noSubLabel$="[[!subLabel]]"> 39 <div id="outerRow" noSubLabel$="[[!subLabel]]">
40 <div class="flex" on-tap="onLabelWrapperTap_" 40 <div class="flex" on-tap="onLabelWrapperTap_"
41 actionable$="[[!controlDisabled_(disabled, pref)]]"> 41 actionable$="[[!controlDisabled_(disabled, pref)]]">
42 <div class="label">[[label]]</div> 42 <div class="label">
43 [[label]]
44 <content select=".label-controls"></content>
45 </div>
43 <div class="secondary label">[[subLabel]]</div> 46 <div class="secondary label">[[subLabel]]</div>
44 </div> 47 </div>
45 <content selector=".more-actions"></content> 48 <content select=".more-actions"></content>
Dan Beam 2017/02/01 00:59:50 so did this just not work before?
tommycli 2017/02/01 01:01:19 There was only one slot before, so I guess it just
46 <template is="dom-if" if="[[pref.controlledBy]]"> 49 <template is="dom-if" if="[[pref.controlledBy]]">
47 <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator> 50 <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator>
48 </template> 51 </template>
49 <paper-toggle-button id="control" checked="{{checked}}" 52 <paper-toggle-button id="control" checked="{{checked}}"
50 disabled="[[controlDisabled_(disabled, pref)]]"> 53 disabled="[[controlDisabled_(disabled, pref)]]">
51 </paper-toggle-button> 54 </paper-toggle-button>
52 </div> 55 </div>
53 </template> 56 </template>
54 <script src="settings_toggle_button.js"></script> 57 <script src="settings_toggle_button.js"></script>
55 </dom-module> 58 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/search_page/search_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698