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/iron-icon/iron-icon.htm
l"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
4 <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"> |
5 <link rel="import" href="../icons.html"> | 6 <link rel="import" href="../icons.html"> |
6 <link rel="import" href="../settings_shared_css.html"> | 7 <link rel="import" href="../settings_shared_css.html"> |
7 | 8 |
8 <dom-module id="settings-camera"> | 9 <dom-module id="settings-camera"> |
9 <template> | 10 <template> |
10 <style include="settings-shared"> | 11 <style include="settings-shared"> |
11 #perspectiveBox { | 12 #perspectiveBox { |
12 height: 228px; | 13 height: 228px; |
13 perspective: 600px; | 14 perspective: 600px; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 } | 67 } |
67 </style> | 68 </style> |
68 <div hidden="[[!cameraActive]]"> | 69 <div hidden="[[!cameraActive]]"> |
69 <div id="perspectiveBox"> | 70 <div id="perspectiveBox"> |
70 <div id="userImageStreamCrop"> | 71 <div id="userImageStreamCrop"> |
71 <video id="cameraVideo" autoplay hidden="[[!cameraOnline_]]"></video> | 72 <video id="cameraVideo" autoplay hidden="[[!cameraOnline_]]"></video> |
72 <paper-spinner active="[[!cameraOnline_]]"></paper-spinner> | 73 <paper-spinner active="[[!cameraOnline_]]"></paper-spinner> |
73 </div> | 74 </div> |
74 </div> | 75 </div> |
75 <div id="cameraControls"> | 76 <div id="cameraControls"> |
76 <paper-icon-button id="flipPhoto" tabindex="2" | 77 <button is="paper-icon-button-light" id="flipPhoto" tabindex="2" |
77 icon="settings:flip" title="$i18n{flipPhoto}" | 78 title="$i18n{flipPhoto}" on-tap="onTapFlipPhoto_" |
78 on-tap="onTapFlipPhoto_" disabled="[[!cameraOnline_]]"> | 79 disabled="[[!cameraOnline_]]"> |
79 </paper-icon-button> | 80 <iron-icon icon="settings:flip"></iron-icon> |
80 <paper-icon-button id="takePhoto" tabindex="1" | 81 </button> |
81 icon="settings:camera-alt" title="$i18n{takePhoto}" | 82 <button is="paper-icon-button-light" id="takePhoto" tabindex="1" |
82 on-tap="takePhoto" disabled="[[!cameraOnline_]]"> | 83 title="$i18n{takePhoto}" on-tap="takePhoto" |
83 </paper-icon-button> | 84 disabled="[[!cameraOnline_]]"> |
| 85 <iron-icon icon="settings:camera-alt"></iron-icon> |
| 86 </button> |
84 </div> | 87 </div> |
85 </div> | 88 </div> |
86 </template> | 89 </template> |
87 <script src="camera.js"></script> | 90 <script src="camera.js"></script> |
88 </dom-module> | 91 </dom-module> |
OLD | NEW |