chrome/browser/resources/settings/people_page/lock_screen.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/people_page/lock_screen.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/people_page/import_data_dialog.html ('k') | chrome/browser/resources/settings/people_page/manage_profile.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/html/action_link.html">	2 <link rel="import" href="chrome://resources/html/action_link.html">

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

4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">	4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

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

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

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

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

9 <link rel="import" href="/people_page/lock_state_behavior.html">	9 <link rel="import" href="lock_state_behavior.html">

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

11 <link rel="import" href="/people_page/setup_pin_dialog.html">	11 <link rel="import" href="setup_pin_dialog.html">

12 <link rel="import" href="/prefs/prefs_behavior.html">	12 <link rel="import" href="../prefs/prefs_behavior.html">

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

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

15	15

16 <dom-module id="settings-lock-screen">	16 <dom-module id="settings-lock-screen">

17 <template>	17 <template>

18 <style include="settings-shared action-link">	18 <style include="settings-shared action-link">

19 .radio-indent {	19 .radio-indent {

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

21 }	21 }

22 </style>	22 </style>

23	23

24 <div>	24 <div>

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 on-close="onPasswordClosed_" set-modes="{{setModes_}}">	65 on-close="onPasswordClosed_" set-modes="{{setModes_}}">

66 </settings-password-prompt-dialog>	66 </settings-password-prompt-dialog>

67 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"	67 <settings-setup-pin-dialog id="setupPin" on-done="onPinSetupDone_"

68 set-modes="[[setModes_]]">	68 set-modes="[[setModes_]]">

69 </settings-setup-pin-dialog>	69 </settings-setup-pin-dialog>

70 </div>	70 </div>

71 </template>	71 </template>

72	72

73 <script src="lock_screen.js"></script>	73 <script src="lock_screen.js"></script>

74 </dom-module>	74 </dom-module>

OLD	NEW