chrome/browser/resources/settings/controls/extension_controlled_indicator.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/extension_controlled_indicator.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/controlled_radio_button.html ('k') | chrome/browser/resources/settings/controls/pref_control_behavior.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/i18n_behavior.html">	1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

2 <link rel="import" href="chrome://resources/html/polymer.html">	2 <link rel="import" href="chrome://resources/html/polymer.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

4 <link rel="import" href="/extension_control_browser_proxy.html">	4 <link rel="import" href="../extension_control_browser_proxy.html">

5 <link rel="import" href="/i18n_setup.html">	5 <link rel="import" href="../i18n_setup.html">

6 <link rel="import" href="/settings_shared_css.html">	6 <link rel="import" href="../settings_shared_css.html">

7	7

8 <dom-module id="extension-controlled-indicator">	8 <dom-module id="extension-controlled-indicator">

9 <template>	9 <template>

10 <style include="settings-shared">	10 <style include="settings-shared">

11 :host {	11 :host {

12 -webkit-margin-start: 36px;	12 -webkit-margin-start: 36px;

13 align-items: center;	13 align-items: center;

14 display: flex;	14 display: flex;

15 min-height: var(--settings-row-min-height);	15 min-height: var(--settings-row-min-height);

16 }	16 }

(...skipping 12 matching lines...) Expand all Loading...
29 <span inner-h-t-m-l="[[getLabel_(extensionId, extensionName)]]"></span>	29 <span inner-h-t-m-l="[[getLabel_(extensionId, extensionName)]]"></span>

30 <template is="dom-if" if="[[extensionCanBeDisabled]]" restamp>	30 <template is="dom-if" if="[[extensionCanBeDisabled]]" restamp>

31 <paper-button class="secondary-button" on-tap="onDisableTap_">	31 <paper-button class="secondary-button" on-tap="onDisableTap_">

32 $i18n{disable}	32 $i18n{disable}

33 </paper-button>	33 </paper-button>

34 </template>	34 </template>

35 </template>	35 </template>

36 </dom-module>	36 </dom-module>

37	37

38 <script src="extension_controlled_indicator.js"></script>	38 <script src="extension_controlled_indicator.js"></script>

OLD	NEW