chrome/browser/resources/settings/site_settings/protocol_handlers.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/site_settings/protocol_handlers.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/site_settings/pdf_documents.html ('k') | chrome/browser/resources/settings/site_settings/site_data.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/cr_elements/icons.html">	2 <link rel="import" href="chrome://resources/cr_elements/icons.html">

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

4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">

5 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">	5 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">

6 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">	6 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">

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

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

9 <link rel="import" href="/site_settings/site_settings_behavior.html">	9 <link rel="import" href="site_settings_behavior.html">

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

11	11

12 <dom-module id="protocol-handlers">	12 <dom-module id="protocol-handlers">

13 <template>	13 <template>

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

15 :host {	15 :host {

16 display: block;	16 display: block;

17 }	17 }

18	18

19 .site-settings-header {	19 .site-settings-header {

20 -webkit-margin-start: 20px;	20 -webkit-margin-start: 20px;

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 $i18n{handlerSetDefault}	63 $i18n{handlerSetDefault}

64 </button>	64 </button>

65 <button class="dropdown-item" role="option" on-tap="onRemoveTap_"	65 <button class="dropdown-item" role="option" on-tap="onRemoveTap_"

66 id="removeButton">	66 id="removeButton">

67 $i18n{handlerRemove}	67 $i18n{handlerRemove}

68 </button>	68 </button>

69 </dialog>	69 </dialog>

70 </template>	70 </template>

71 <script src="protocol_handlers.js"></script>	71 <script src="protocol_handlers.js"></script>

72 </dom-module>	72 </dom-module>

OLD	NEW