| 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/html/util.html"> | 3 <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"> | 4 <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"> | 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="/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 } |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 </style> | 67 </style> |
| 68 <div hidden="[[!cameraActive]]"> | 68 <div hidden="[[!cameraActive]]"> |
| 69 <div id="perspectiveBox"> | 69 <div id="perspectiveBox"> |
| 70 <div id="userImageStreamCrop"> | 70 <div id="userImageStreamCrop"> |
| 71 <video id="cameraVideo" autoplay hidden="[[!cameraOnline_]]"></video> | 71 <video id="cameraVideo" autoplay hidden="[[!cameraOnline_]]"></video> |
| 72 <paper-spinner active="[[!cameraOnline_]]"></paper-spinner> | 72 <paper-spinner active="[[!cameraOnline_]]"></paper-spinner> |
| 73 </div> | 73 </div> |
| 74 </div> | 74 </div> |
| 75 <div id="cameraControls"> | 75 <div id="cameraControls"> |
| 76 <paper-icon-button id="flipPhoto" tabindex="2" | 76 <paper-icon-button id="flipPhoto" tabindex="2" |
| 77 icon="settings:flip" title="$i18n{flipPhoto}" | 77 icon="cr:flip" title="$i18n{flipPhoto}" |
| 78 on-tap="onTapFlipPhoto_" disabled="[[!cameraOnline_]]"> | 78 on-tap="onTapFlipPhoto_" disabled="[[!cameraOnline_]]"> |
| 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="cr: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 |