chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.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/bluetooth_page/bluetooth_device_dialog.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/basic_page/basic_page.html ('k') | chrome/browser/resources/settings/bluetooth_page/bluetooth_device_list_item.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_dialog/cr_dialog.html ">	1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">

2 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml">	2 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml">

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

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

5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l">	6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l">

7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">	8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">

9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">	9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">

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

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

12	12

13 <dom-module id="bluetooth-device-dialog">	13 <dom-module id="bluetooth-device-dialog">

14 <template>	14 <template>

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

16 #pairing {	16 #pairing {

17 margin-bottom: 10px;	17 margin-bottom: 10px;

18 }	18 }

19	19

20 #pairing paper-input {	20 #pairing paper-input {

21 text-align: center;	21 text-align: center;

(...skipping 147 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
169 </template>	169 </template>

170 <template is="dom-if" if="[[isDialogType_('connectError', dialogId)]]">	170 <template is="dom-if" if="[[isDialogType_('connectError', dialogId)]]">

171 <paper-button on-tap="close">$i18n{bluetoothDismiss}	171 <paper-button on-tap="close">$i18n{bluetoothDismiss}

172 </paper-button>	172 </paper-button>

173 </template>	173 </template>

174 </div>	174 </div>

175 </dialog>	175 </dialog>

176 </template>	176 </template>

177 <script src="bluetooth_device_dialog.js"></script>	177 <script src="bluetooth_device_dialog.js"></script>

178 </dom-module>	178 </dom-module>

OLD	NEW