chrome/browser/resources/settings/reset_page/reset_page.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/reset_page/reset_page.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/reset_page/powerwash_dialog.html ('k') | chrome/browser/resources/settings/reset_page/reset_profile_banner.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_lazy_render/cr_lazy_r ender.html">	1 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_r ender.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-icon-button/paper -icon-button-light.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">

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

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

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

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

8	8

9 <if expr="chromeos">	9 <if expr="chromeos">

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

11 </if>	11 </if>

12	12

13 <dom-module id="settings-reset-page">	13 <dom-module id="settings-reset-page">

14 <template>	14 <template>

15 <style include="settings-shared"></style>	15 <style include="settings-shared"></style>

16 <div class="settings-box first two-line" id="resetProfile"	16 <div class="settings-box first two-line" id="resetProfile"

17 on-tap="onShowResetProfileDialog_" actionable>	17 on-tap="onShowResetProfileDialog_" actionable>

18 <div class="start">	18 <div class="start">

19 <div>$i18n{resetPageTitle}</div>	19 <div>$i18n{resetPageTitle}</div>

20 <div class="secondary">$i18n{resetPageDescription}</div>	20 <div class="secondary">$i18n{resetPageDescription}</div>

(...skipping 14 matching lines...) Expand all Loading...
35 <button class="subpage-arrow" is="paper-icon-button-light"></button>	35 <button class="subpage-arrow" is="paper-icon-button-light"></button>

36 </div>	36 </div>

37 <template is="dom-if" if="[[showPowerwashDialog_]]" restamp>	37 <template is="dom-if" if="[[showPowerwashDialog_]]" restamp>

38 <settings-powerwash-dialog on-close="onPowerwashDialogClose_">	38 <settings-powerwash-dialog on-close="onPowerwashDialogClose_">

39 </settings-powerwash-dialog>	39 </settings-powerwash-dialog>

40 </template>	40 </template>

41 </if>	41 </if>

42 </template>	42 </template>

43 <script src="reset_page.js"></script>	43 <script src="reset_page.js"></script>

44 </dom-module>	44 </dom-module>

OLD	NEW