chrome/browser/resources/settings/controls/settings_toggle_button.html - Issue 2664503004: MD Settings: Make all HTML import href's relative.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2664503004: MD Settings: Make all HTML import href's relative. (Closed)

Patch Set: resolve more conflicts 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 | « chrome/browser/resources/settings/controls/settings_radio_group.html ('k') | chrome/browser/resources/settings/date_time_page/date_time_page.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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="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,

11 :host([elide-label]) #outerRow > div.flex {	11 :host([elide-label]) #outerRow > div.flex {

12 min-width: 0;	12 min-width: 0;

13 }	13 }

14	14

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 <template is="dom-if" if="[[pref.controlledBy]]">	46 <template is="dom-if" if="[[pref.controlledBy]]">

47 <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator>	47 <cr-policy-pref-indicator pref="[[pref]]"></cr-policy-pref-indicator>

48 </template>	48 </template>

49 <paper-toggle-button id="control" checked="{{checked}}"	49 <paper-toggle-button id="control" checked="{{checked}}"

50 disabled="[[controlDisabled_(disabled, pref)]]">	50 disabled="[[controlDisabled_(disabled, pref)]]">

51 </paper-toggle-button>	51 </paper-toggle-button>

52 </div>	52 </div>

53 </template>	53 </template>

54 <script src="settings_toggle_button.js"></script>	54 <script src="settings_toggle_button.js"></script>

55 </dom-module>	55 </dom-module>

OLD	NEW