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

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

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

5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">	5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">

6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html">	6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html">

7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html">	7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html">

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

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

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

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

12 <link rel="import" href="/people_page/change_picture_browser_proxy.html">	12 <link rel="import" href="change_picture_browser_proxy.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-change-picture">	16 <dom-module id="settings-change-picture">

17 <template>	17 <template>

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

19 #container {	19 #container {

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

21 align-items: flex-start;	21 align-items: flex-start;

22 outline: none;	22 outline: none;

23 padding-top: 16px;	23 padding-top: 16px;

24 }	24 }

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 </div>	142 </div>

143 <settings-camera id="camera"	143 <settings-camera id="camera"

144 camera-active="[[isCameraActive_(cameraPresent_, selectedItem_)]]"	144 camera-active="[[isCameraActive_(cameraPresent_, selectedItem_)]]"

145 on-phototaken="onPhotoTaken_">	145 on-phototaken="onPhotoTaken_">

146 </settings-camera>	146 </settings-camera>

147 </div>	147 </div>

148 </div>	148 </div>

149 </template>	149 </template>

150 <script src="change_picture.js"></script>	150 <script src="change_picture.js"></script>

151 </dom-module>	151 </dom-module>

OLD	NEW