chrome/browser/resources/settings/search_engines_page/search_engine_entry.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/search_engines_page/search_engine_entry.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/search_engines_page/search_engine_dialog.html ('k') | chrome/browser/resources/settings/search_engines_page/search_engines_list.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/cr_elements/cr_action_menu/cr_action _menu.html">	1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">

2 <link rel="import" href="chrome://resources/cr_elements/icons.html">	2 <link rel="import" href="chrome://resources/cr_elements/icons.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/html/icon.html">	4 <link rel="import" href="chrome://resources/html/icon.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">

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

7 <link rel="import" href="/search_engines_page/search_engine_dialog.html">	7 <link rel="import" href="search_engine_dialog.html">

8 <link rel="import" href="/search_engines_page/search_engine_entry_css.html">	8 <link rel="import" href="search_engine_entry_css.html">

9 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" >	9 <link rel="import" href="search_engines_browser_proxy.html">

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

11	11

12 <dom-module id="settings-search-engine-entry">	12 <dom-module id="settings-search-engine-entry">

13 <template>	13 <template>

14 <style include="settings-shared search-engine-entry">	14 <style include="settings-shared search-engine-entry">

15 :host([is-default]) .list-item {	15 :host([is-default]) .list-item {

16 font-weight: 500;	16 font-weight: 500;

17 }	17 }

18	18

19 .column {	19 .column {

20 -webkit-margin-end: 8px;	20 -webkit-margin-end: 8px;

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 <template is="dom-if" if="[[engine.extension]]">	61 <template is="dom-if" if="[[engine.extension]]">

62 <extension-controlled-indicator	62 <extension-controlled-indicator

63 extension-id="[[engine.extension.id]]"	63 extension-id="[[engine.extension.id]]"

64 extension-name="[[engine.extension.name]]"	64 extension-name="[[engine.extension.name]]"

65 extension-can-be-disabled="[[engine.extension.canBeDisabled]]">	65 extension-can-be-disabled="[[engine.extension.canBeDisabled]]">

66 </extension-controlled-indicator>	66 </extension-controlled-indicator>

67 </template>	67 </template>

68 </template>	68 </template>

69 <script src="search_engine_entry.js"></script>	69 <script src="search_engine_entry.js"></script>

70 </dom-module>	70 </dom-module>

OLD	NEW