chrome/browser/resources/settings/people_page/camera.html - Issue 1959163002: MD Settings: use custom iconset

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 1959163002: MD Settings: use custom iconset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SettingsIcons

Patch Set: rebase Created 4 years, 7 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/i18n_behavior.html">	1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

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

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

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. html">

5 <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-icon-button/paper -icon-button.html">

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

	6 <link rel="import" href="chrome://md-settings/icons.html">

7 <link rel="import" href="chrome://md-settings/settings_shared_css.html">	7 <link rel="import" href="chrome://md-settings/settings_shared_css.html">

8	8

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

10 <link rel="import" type="css" href="camera.css">	10 <link rel="import" type="css" href="camera.css">

11 <template>	11 <template>

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

13 <div hidden="[[!cameraActive]]">	13 <div hidden="[[!cameraActive]]">

14 <div id="perspectiveBox">	14 <div id="perspectiveBox">

15 <div id="userImageStreamCrop">	15 <div id="userImageStreamCrop">

16 <video id="cameraVideo" autoplay hidden="[[!cameraOnline_]]"></video>	16 <video id="cameraVideo" autoplay hidden="[[!cameraOnline_]]"></video>

17 <paper-spinner active="[[!cameraOnline_]]"></paper-spinner>	17 <paper-spinner active="[[!cameraOnline_]]"></paper-spinner>

18 </div>	18 </div>

19 </div>	19 </div>

20 <div id="cameraControls">	20 <div id="cameraControls">

21 <paper-icon-button id="flipPhoto" tabindex="2" icon="image:flip"	21 <paper-icon-button id="flipPhoto" tabindex="2"

22 i18n-values="title:flipPhoto" on-tap="onTapFlipPhoto_"	22 icon="settings:flip" i18n-values="title:flipPhoto"

23 disabled="[[!cameraOnline_]]">	23 on-tap="onTapFlipPhoto_" disabled="[[!cameraOnline_]]">

24 </paper-icon-button>	24 </paper-icon-button>

25 <paper-icon-button id="takePhoto" tabindex="1" icon="image:camera-alt"	25 <paper-icon-button id="takePhoto" tabindex="1"

26 i18n-values="title:takePhoto" on-tap="takePhoto"	26 icon="settings:camera-alt" i18n-values="title:takePhoto"

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

28 </paper-icon-button>	28 </paper-icon-button>

29 </div>	29 </div>

30 </div>	30 </div>

31 </template>	31 </template>

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

33 </dom-module>	33 </dom-module>

OLD	NEW