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/cr_elements/cr_dialog/cr_dialog.html "> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
| 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> | |
|
dpapad
2016/11/17 23:59:28
Let's remove this dependency.
scottchen
2016/11/18 02:09:43
Done.
| |
| 6 <link rel="import" href="/route.html"> | 7 <link rel="import" href="/route.html"> |
| 7 <link rel="import" href="/settings_shared_css.html"> | 8 <link rel="import" href="/settings_shared_css.html"> |
| 8 <link rel="import" href="/site_settings/constants.html"> | 9 <link rel="import" href="/site_settings/constants.html"> |
| 9 <link rel="import" href="/site_settings/site_details_permission.html"> | 10 <link rel="import" href="/site_settings/site_details_permission.html"> |
| 10 <link rel="import" href="/site_settings/site_settings_behavior.html"> | 11 <link rel="import" href="/site_settings/site_settings_behavior.html"> |
| 11 <link rel="import" href="/site_settings/website_usage_private_api.html"> | 12 <link rel="import" href="/site_settings/website_usage_private_api.html"> |
| 12 | 13 |
| 13 <dom-module id="site-details"> | 14 <dom-module id="site-details"> |
| 14 <template> | 15 <template> |
| 15 <style include="settings-shared"> | 16 <style include="settings-shared"> |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 34 </paper-button> | 35 </paper-button> |
| 35 </div> | 36 </div> |
| 36 </dialog> | 37 </dialog> |
| 37 | 38 |
| 38 <div class="settings-box first"> | 39 <div class="settings-box first"> |
| 39 <div class="favicon-image" | 40 <div class="favicon-image" |
| 40 style$="[[computeSiteIcon(site.originForDisplay)]]"> | 41 style$="[[computeSiteIcon(site.originForDisplay)]]"> |
| 41 </div> | 42 </div> |
| 42 <div class="middle">[[site.originForDisplay]]</div> | 43 <div class="middle">[[site.originForDisplay]]</div> |
| 43 </div> | 44 </div> |
| 44 <div id="usage" hidden$="[[!storedData_]]"> | 45 <div id="usage" hidden$="[[!storedData_]]"> |
|
Dan Beam
2016/11/18 00:06:16
can we just make this a dom-if instead then?
scottchen
2016/11/18 02:09:43
Done.
| |
| 45 <div class="settings-box first"> | 46 <div class="settings-box first"> |
| 46 <h2>$i18n{siteSettingsUsage}</h2> | 47 <h2>$i18n{siteSettingsUsage}</h2> |
| 47 </div> | 48 </div> |
| 48 <div class="list-frame"> | 49 <div class="list-frame"> |
| 49 <paper-item id="storage" hidden$="[[!storedData_]]"> | 50 <div class="list-item" id="storage"> |
|
dpapad
2016/11/17 23:36:58
We still need the hidden$="[[!storedData_]] part,
scottchen
2016/11/17 23:55:50
An ancestor element has the exact same hidden cond
dpapad
2016/11/17 23:59:28
I see. Good catch.
scottchen
2016/11/18 02:09:43
Done.
| |
| 50 <div class="flex">[[storedData_]]</div> | 51 <div class="flex">[[storedData_]]</div> |
| 51 <paper-icon-button icon="cr:delete" | 52 <paper-icon-button icon="cr:delete" |
| 52 on-tap="onConfirmClearStorage_" | 53 on-tap="onConfirmClearStorage_" |
| 53 alt="$i18n{siteSettingsDelete}"></paper-icon-button> | 54 alt="$i18n{siteSettingsDelete}"></paper-icon-button> |
| 54 </paper-item> | 55 </div> |
| 55 </div> | 56 </div> |
| 56 </div> | 57 </div> |
| 57 <div class="settings-box first"> | 58 <div class="settings-box first"> |
| 58 <h2>$i18n{siteSettingsPermissions}</h2> | 59 <h2>$i18n{siteSettingsPermissions}</h2> |
| 59 </div> | 60 </div> |
| 60 <div class="list-frame"> | 61 <div class="list-frame"> |
| 61 <site-details-permission category="{{ContentSettingsTypes.COOKIES}}" | 62 <site-details-permission category="{{ContentSettingsTypes.COOKIES}}" |
| 62 icon="settings:cookie" id="cookies" label="$i18n{siteSettingsCookies}" | 63 icon="settings:cookie" id="cookies" label="$i18n{siteSettingsCookies}" |
| 63 site="[[site]]"> | 64 site="[[site]]"> |
| 64 </site-details-permission> | 65 </site-details-permission> |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 114 $i18n{siteSettingsClearAndReset} | 115 $i18n{siteSettingsClearAndReset} |
| 115 </div> | 116 </div> |
| 116 </div> | 117 </div> |
| 117 <website-usage-private-api id="usageApi" | 118 <website-usage-private-api id="usageApi" |
| 118 website-data-usage="{{storedData_}}" | 119 website-data-usage="{{storedData_}}" |
| 119 website-storage-type="{{storageType_}}"> | 120 website-storage-type="{{storageType_}}"> |
| 120 </website-usage-private-api> | 121 </website-usage-private-api> |
| 121 </template> | 122 </template> |
| 122 <script src="site_details.js"></script> | 123 <script src="site_details.js"></script> |
| 123 </dom-module> | 124 </dom-module> |
| OLD | NEW |