| 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"> | |
| 11 <link rel="import" href="/people_page/camera.html"> | 10 <link rel="import" href="/people_page/camera.html"> |
| 12 <link rel="import" href="/people_page/change_picture_browser_proxy.html"> | 11 <link rel="import" href="/people_page/change_picture_browser_proxy.html"> |
| 13 <link rel="import" href="/route.html"> | 12 <link rel="import" href="/route.html"> |
| 14 <link rel="import" href="/settings_shared_css.html"> | 13 <link rel="import" href="/settings_shared_css.html"> |
| 15 | 14 |
| 16 <dom-module id="settings-change-picture"> | 15 <dom-module id="settings-change-picture"> |
| 17 <template> | 16 <template> |
| 18 <style include="settings-shared"> | 17 <style include="settings-shared"> |
| 19 #container { | 18 #container { |
| 20 -webkit-margin-start: 16px; | 19 -webkit-margin-start: 16px; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 </style> | 93 </style> |
| 95 <div id="container" class="settings-box" tabindex="0"> | 94 <div id="container" class="settings-box" tabindex="0"> |
| 96 <iron-a11y-keys keys="up down left right space enter" | 95 <iron-a11y-keys keys="up down left right space enter" |
| 97 on-keys-pressed="onKeysPress_"> | 96 on-keys-pressed="onKeysPress_"> |
| 98 </iron-a11y-keys> | 97 </iron-a11y-keys> |
| 99 <div id="availableIcons" class="start"> | 98 <div id="availableIcons" class="start"> |
| 100 <iron-selector id="selector" on-iron-activate="onImageActivate_" | 99 <iron-selector id="selector" on-iron-activate="onImageActivate_" |
| 101 selected-item="{{selectedItem_}}"> | 100 selected-item="{{selectedItem_}}"> |
| 102 <iron-icon id="cameraImage" | 101 <iron-icon id="cameraImage" |
| 103 data-type$="[[selectionTypesEnum_.CAMERA]]" | 102 data-type$="[[selectionTypesEnum_.CAMERA]]" |
| 104 icon="settings:camera-alt" title="$i18n{takePhoto}" | 103 icon="cr:camera-alt" title="$i18n{takePhoto}" |
| 105 hidden="[[!cameraPresent_]]"> | 104 hidden="[[!cameraPresent_]]"> |
| 106 </iron-icon> | 105 </iron-icon> |
| 107 <iron-icon data-type$="[[selectionTypesEnum_.FILE]]" | 106 <iron-icon data-type$="[[selectionTypesEnum_.FILE]]" |
| 108 icon="settings:folder" title="$i18n{chooseFile}"> | 107 icon="cr:folder" title="$i18n{chooseFile}"> |
| 109 </iron-icon> | 108 </iron-icon> |
| 110 <img id="profileImage" | 109 <img id="profileImage" |
| 111 data-type$="[[selectionTypesEnum_.PROFILE]]" | 110 data-type$="[[selectionTypesEnum_.PROFILE]]" |
| 112 src="[[profileImageUrl_]]" title="$i18n{profilePhotoLoading}"> | 111 src="[[profileImageUrl_]]" title="$i18n{profilePhotoLoading}"> |
| 113 <img id="oldImage" data-type$="[[selectionTypesEnum_.OLD]]" | 112 <img id="oldImage" data-type$="[[selectionTypesEnum_.OLD]]" |
| 114 src="[[oldImageUrl_]]" hidden="[[!oldImageUrl_]]" | 113 src="[[oldImageUrl_]]" hidden="[[!oldImageUrl_]]" |
| 115 title="$i18n{oldPhoto}"> | 114 title="$i18n{oldPhoto}"> |
| 116 <template is="dom-repeat" items="[[defaultImages_]]"> | 115 <template is="dom-repeat" items="[[defaultImages_]]"> |
| 117 <img data-type$="[[selectionTypesEnum_.DEFAULT]]" | 116 <img data-type$="[[selectionTypesEnum_.DEFAULT]]" |
| 118 data-default-image-index$="[[index]]" src="[[item.url]]" | 117 data-default-image-index$="[[index]]" src="[[item.url]]" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 142 </div> | 141 </div> |
| 143 <settings-camera id="camera" | 142 <settings-camera id="camera" |
| 144 camera-active="[[isCameraActive_(cameraPresent_, selectedItem_)]]" | 143 camera-active="[[isCameraActive_(cameraPresent_, selectedItem_)]]" |
| 145 on-phototaken="onPhotoTaken_"> | 144 on-phototaken="onPhotoTaken_"> |
| 146 </settings-camera> | 145 </settings-camera> |
| 147 </div> | 146 </div> |
| 148 </div> | 147 </div> |
| 149 </template> | 148 </template> |
| 150 <script src="change_picture.js"></script> | 149 <script src="change_picture.js"></script> |
| 151 </dom-module> | 150 </dom-module> |
| OLD | NEW |