Chromium Code Reviews| 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/assert.html"> | 2 <link rel="import" href="chrome://resources/html/assert.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="certificate_entry.html"> | 4 <link rel="import" href="certificate_entry.html"> |
| 5 <link rel="import" href="certificate_manager_types.html"> | 5 <link rel="import" href="certificate_manager_types.html"> |
| 6 <link rel="import" href="certificates_browser_proxy.html"> | 6 <link rel="import" href="certificates_browser_proxy.html"> |
| 7 <link rel="import" href="../i18n_setup.html"> | 7 <link rel="import" href="../i18n_setup.html"> |
| 8 <link rel="import" href="../settings_shared_css.html"> | 8 <link rel="import" href="../settings_shared_css.html"> |
| 9 | 9 |
| 10 <dom-module id="settings-certificate-list"> | 10 <dom-module id="settings-certificate-list"> |
| 11 <template> | 11 <template> |
| 12 <style include="settings-shared"> | 12 <style include="settings-shared"> |
| 13 .settings-box { | 13 .settings-box { |
| 14 margin-bottom: 24px; | 14 margin-bottom: 24px; |
| 15 } | 15 } |
| 16 </style> | 16 </style> |
| 17 <div class="settings-box first"> | 17 <div class="settings-box first"> |
| 18 <span class="start"> | 18 <span class="start"> |
| 19 [[getDescription_(certificateType, certificates)]]</span> | 19 [[getDescription_(certificateType, certificates)]]</span> |
| 20 <paper-button id="import" on-tap="onImportTap_" | 20 <paper-button id="import" on-tap="onImportTap_" |
| 21 hidden="[[!canImport_(certificateType)]]"> | 21 hidden="[[!canImport_(certificateType)]]"> |
| 22 $i18n{certificateManagerImport}</paper-button> | 22 $i18n{certificateManagerImport}</paper-button> |
| 23 <if expr="chromeos"> | 23 <if expr="chromeos"> |
| 24 <paper-button id="importAndBind" on-tap="onImportAndBindTap_" | 24 <paper-button id="importAndBind" on-tap="onImportAndBindTap_" |
| 25 hidden="[[!canImportAndBind_(certificateType)]]"> | 25 hidden="[[!canImportAndBind_(certificateType, isGuest_)]]"> |
|
dpapad
2017/05/04 23:35:40
The bug report is calling from graying out the but
stevenjb
2017/05/08 16:44:43
Hiding as per comment in crbug.com/717204
| |
| 26 $i18n{certificateManagerImportAndBind}</paper-button> | 26 $i18n{certificateManagerImportAndBind}</paper-button> |
| 27 </if> | 27 </if> |
| 28 </div> | 28 </div> |
| 29 <template is="dom-repeat" items="[[certificates]]"> | 29 <template is="dom-repeat" items="[[certificates]]"> |
| 30 <settings-certificate-entry model="[[item]]" | 30 <settings-certificate-entry model="[[item]]" |
| 31 certificate-type="[[certificateType]]"> | 31 certificate-type="[[certificateType]]"> |
| 32 </settings-certificate-entry> | 32 </settings-certificate-entry> |
| 33 </template> | 33 </template> |
| 34 </template> | 34 </template> |
| 35 <script src="certificate_list.js"></script> | 35 <script src="certificate_list.js"></script> |
| 36 </dom-module> | 36 </dom-module> |
| OLD | NEW |