chrome/browser/resources/settings/people_page/camera.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/camera.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/passwords_and_forms_page/passwords_section.html ('k') | chrome/browser/resources/settings/people_page/change_picture.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/util.html">	2 <link rel="import" href="chrome://resources/html/util.html">

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

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

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

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

7	7

8 <dom-module id="settings-camera">	8 <dom-module id="settings-camera">

9 <template>	9 <template>

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

11 #perspectiveBox {	11 #perspectiveBox {

12 -webkit-perspective: 600px;	12 -webkit-perspective: 600px;

13 height: 228px;	13 height: 228px;

14 width: 228px;	14 width: 228px;

15 }	15 }

16	16

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 </paper-icon-button>	79 </paper-icon-button>

80 <paper-icon-button id="takePhoto" tabindex="1"	80 <paper-icon-button id="takePhoto" tabindex="1"

81 icon="settings:camera-alt" title="$i18n{takePhoto}"	81 icon="settings:camera-alt" title="$i18n{takePhoto}"

82 on-tap="takePhoto" disabled="[[!cameraOnline_]]">	82 on-tap="takePhoto" disabled="[[!cameraOnline_]]">

83 </paper-icon-button>	83 </paper-icon-button>

84 </div>	84 </div>

85 </div>	85 </div>

86 </template>	86 </template>

87 <script src="camera.js"></script>	87 <script src="camera.js"></script>

88 </dom-module>	88 </dom-module>

OLD	NEW