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

3 <link rel="import" href="chrome://resources/cr_elements/icons.html">	3 <link rel="import" href="chrome://resources/cr_elements/icons.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">

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

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

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

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

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

10	10

11 <dom-module id="site-data">	11 <dom-module id="site-data">

12 <template>	12 <template>

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

14 paper-button#removeButton {	14 paper-button#removeButton {

15 -webkit-margin-start: auto;	15 -webkit-margin-start: auto;

16 }	16 }

17	17

18 .subtitle-row {	18 .subtitle-row {

19 margin-top: 9px; /* With 15px in sub-items == 24px total margin. */	19 margin-top: 9px; /* With 15px in sub-items == 24px total margin. */

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 <paper-button class="action-button" on-tap="onConfirmDelete_">	60 <paper-button class="action-button" on-tap="onConfirmDelete_">

61 $i18n{siteSettingsCookiesClearAll}	61 $i18n{siteSettingsCookiesClearAll}

62 </paper-button>	62 </paper-button>

63 </div>	63 </div>

64 </dialog>	64 </dialog>

65 </template>	65 </template>

66 <script src="cookie_info.js"></script>	66 <script src="cookie_info.js"></script>

67 <script src="cookie_tree_node.js"></script>	67 <script src="cookie_tree_node.js"></script>

68 <script src="site_data.js"></script>	68 <script src="site_data.js"></script>

69 </dom-module>	69 </dom-module>

OLD	NEW