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/web_ui_listener_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-tabs/paper-tabs.h tml"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> |
| 5 <link rel="import" href="chrome://md-settings/certificate_manager_page/ca_trust_ edit_dialog.html"> | 5 <link rel="import" href="chrome://md-settings/certificate_manager_page/ca_trust_ edit_dialog.html"> |
| 6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_delete_confirmation_dialog.html"> | 6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_delete_confirmation_dialog.html"> |
| 7 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_list.html"> | 7 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_list.html"> |
| 8 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_password_decryption_dialog.html"> | 8 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_password_decryption_dialog.html"> |
| 9 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_password_encryption_dialog.html"> | 9 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_password_encryption_dialog.html"> |
| 10 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica tes_browser_proxy.html"> | 10 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica tes_browser_proxy.html"> |
| 11 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica tes_error_dialog.html"> | 11 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica tes_error_dialog.html"> |
| 12 | 12 |
| 13 <dom-module id="settings-certificate-manager-page"> | 13 <dom-module id="settings-certificate-manager-page"> |
| 14 <template> | 14 <template> |
| 15 <style> | 15 <style> |
| 16 /* TODO(dpapad): Find exact color value to use. */ | |
| 17 :host { | 16 :host { |
| 18 --paper-tabs-selection-bar-color: blue; | 17 --paper-tabs-selection-bar-color: var(--paper-blue-500); |
| 18 } | |
| 19 | |
| 20 paper-tabs { | |
| 21 height: 40px; | |
| 22 margin-bottom: 24px; | |
| 23 } | |
| 24 | |
| 25 paper-tab { | |
| 26 text-transform: uppercase; | |
|
Dan Beam
2016/04/01 18:38:02
hmmm, why are we differing from Polymer in this re
dpapad
2016/04/01 21:13:17
We don't use paper-tabs anywhere else in settings,
Dan Beam
2016/04/02 02:08:16
it's because all the demos are IN ALL UPPER (but n
| |
| 19 } | 27 } |
| 20 </style> | 28 </style> |
| 21 | 29 |
| 22 <template is="dom-if" if="[[showCaTrustEditDialog_]]" restamp> | 30 <template is="dom-if" if="[[showCaTrustEditDialog_]]" restamp> |
| 23 <settings-ca-trust-edit-dialog model="[[dialogModel_]]"> | 31 <settings-ca-trust-edit-dialog model="[[dialogModel_]]"> |
| 24 </settings-ca-trust-edit-dialog> | 32 </settings-ca-trust-edit-dialog> |
| 25 </template> | 33 </template> |
| 26 <template is="dom-if" if="[[showDeleteConfirmationDialog_]]" restamp> | 34 <template is="dom-if" if="[[showDeleteConfirmationDialog_]]" restamp> |
| 27 <settings-certificate-delete-confirmation-dialog | 35 <settings-certificate-delete-confirmation-dialog |
| 28 model="[[dialogModel_]]" | 36 model="[[dialogModel_]]" |
| 29 certificate-type="[[dialogModelCertificateType_]]"> | 37 certificate-type="[[dialogModelCertificateType_]]"> |
| 30 </settings-certificate-delete-confirmation-dialog> | 38 </settings-certificate-delete-confirmation-dialog> |
| 31 </template> | 39 </template> |
| 32 <template is="dom-if" if="[[showPasswordEncryptionDialog_]]" restamp> | 40 <template is="dom-if" if="[[showPasswordEncryptionDialog_]]" restamp> |
| 33 <settings-certificate-password-encryption-dialog | 41 <settings-certificate-password-encryption-dialog |
| 34 model="[[dialogModel_]]"> | 42 model="[[dialogModel_]]"> |
| 35 </settings-certificate-password-encryption-dialog> | 43 </settings-certificate-password-encryption-dialog> |
| 36 </template> | 44 </template> |
| 37 <template is="dom-if" if="[[showPasswordDecryptionDialog_]]" restamp> | 45 <template is="dom-if" if="[[showPasswordDecryptionDialog_]]" restamp> |
| 38 <settings-certificate-password-decryption-dialog> | 46 <settings-certificate-password-decryption-dialog> |
| 39 </settings-certificate-password-decryption-dialog> | 47 </settings-certificate-password-decryption-dialog> |
| 40 </template> | 48 </template> |
| 41 <template is="dom-if" if="[[showErrorDialog_]]" restamp> | 49 <template is="dom-if" if="[[showErrorDialog_]]" restamp> |
| 42 <settings-certificates-error-dialog model="[[errorDialogModel_]]"> | 50 <settings-certificates-error-dialog model="[[errorDialogModel_]]"> |
| 43 </settings-certificates-error-dialog> | 51 </settings-certificates-error-dialog> |
| 44 </template> | 52 </template> |
| 45 | 53 |
| 46 <paper-tabs selected="{{selected}}"> | 54 <paper-tabs noink selected="{{selected}}"> |
|
Dan Beam
2016/04/01 18:38:02
why no ink?
dpapad
2016/04/01 21:13:17
The mocks don't specify ink/noink on this one. I c
Dan Beam
2016/04/02 02:08:16
because this is unspecified i don't care, but i'd
| |
| 47 <paper-tab>$i18n{certificateManagerYourCertificates}</paper-tab> | 55 <paper-tab>$i18n{certificateManagerYourCertificates}</paper-tab> |
| 48 <paper-tab>$i18n{certificateManagerServers}</paper-tab> | 56 <paper-tab>$i18n{certificateManagerServers}</paper-tab> |
| 49 <paper-tab>$i18n{certificateManagerAuthorities}</paper-tab> | 57 <paper-tab>$i18n{certificateManagerAuthorities}</paper-tab> |
| 50 <paper-tab>$i18n{certificateManagerOthers}</paper-tab> | 58 <paper-tab>$i18n{certificateManagerOthers}</paper-tab> |
| 51 </paper-tabs> | 59 </paper-tabs> |
| 52 <iron-pages selected="[[selected]]"> | 60 <iron-pages selected="[[selected]]"> |
| 53 <div> | 61 <div> |
| 54 <settings-certificate-list id="personalCerts" | 62 <settings-certificate-list id="personalCerts" |
| 55 certificates="[[personalCerts]]" | 63 certificates="[[personalCerts]]" |
| 56 certificate-type="[[certificateTypeEnum_.PERSONAL]]"> | 64 certificate-type="[[certificateTypeEnum_.PERSONAL]]"> |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 77 <settings-certificate-list id="otherCerts" | 85 <settings-certificate-list id="otherCerts" |
| 78 certificates="[[otherCerts]]" | 86 certificates="[[otherCerts]]" |
| 79 certificate-type="[[certificateTypeEnum_.OTHER]]"> | 87 certificate-type="[[certificateTypeEnum_.OTHER]]"> |
| 80 </settings-certificate-list> | 88 </settings-certificate-list> |
| 81 </template> | 89 </template> |
| 82 </div> | 90 </div> |
| 83 </iron-pages> | 91 </iron-pages> |
| 84 </template> | 92 </template> |
| 85 <script src="certificate_manager_page.js"></script> | 93 <script src="certificate_manager_page.js"></script> |
| 86 </dom-module> | 94 </dom-module> |
| OLD | NEW |