chrome/browser/resources/settings/printing_page/printing_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/printing_page/printing_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/printing_page/cups_printers_list.html ('k') | chrome/browser/resources/settings/privacy_page/privacy_page.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/polymer/v1_0/neon-animation/neon-ani matable.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.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="/printing_page/cloud_printers.html">	4 <link rel="import" href="cloud_printers.html">

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

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

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

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

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

10 <link rel="import" href="/printing_page/cups_printer_details_page.html">	10 <link rel="import" href="cups_printer_details_page.html">

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

12 </if>	12 </if>

13	13

14 <dom-module id="settings-printing-page">	14 <dom-module id="settings-printing-page">

15 <template>	15 <template>

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

17 <settings-animated-pages id="pages" section="printing">	17 <settings-animated-pages id="pages" section="printing">

18 <array-selector id="arraySelector" items="{{cupsPrinters}}"	18 <array-selector id="arraySelector" items="{{cupsPrinters}}"

19 selected="{{detailPrinter_}}">	19 selected="{{detailPrinter_}}">

20 </array-selector>	20 </array-selector>

21 <neon-animatable route-path="default">	21 <neon-animatable route-path="default">

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 associated-control="[[$$('#cloudPrinters')]]"	66 associated-control="[[$$('#cloudPrinters')]]"

67 page-title="$i18n{cloudPrintersTitle}">	67 page-title="$i18n{cloudPrintersTitle}">

68 <settings-cloud-printers prefs="{{prefs}}">	68 <settings-cloud-printers prefs="{{prefs}}">

69 </settings-cloud-printers>	69 </settings-cloud-printers>

70 </settings-subpage>	70 </settings-subpage>

71 </template>	71 </template>

72 </settings-animated-pages>	72 </settings-animated-pages>

73 </template>	73 </template>

74 <script src="printing_page.js"></script>	74 <script src="printing_page.js"></script>

75 </dom-module>	75 </dom-module>

OLD	NEW