| Index: chrome/browser/resources/settings/site_settings/zoom_levels.html
|
| diff --git a/chrome/browser/resources/settings/site_settings/zoom_levels.html b/chrome/browser/resources/settings/site_settings/zoom_levels.html
|
| index 2806ac8c94361ee6c04e85c13845bd327d6a1c5f..b6b05c0daa9e17652d1f8e8ecf9672a55f47d66f 100644
|
| --- a/chrome/browser/resources/settings/site_settings/zoom_levels.html
|
| +++ b/chrome/browser/resources/settings/site_settings/zoom_levels.html
|
| @@ -1,6 +1,7 @@
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| <link rel="import" href="chrome://resources/cr_elements/icons.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
|
| +<link rel="import" href="chrome://resources/html/i18n_behavior.html">
|
| <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
|
| <link rel="import" href="../i18n_setup.html">
|
| <link rel="import" href="../settings_shared_css.html">
|
| @@ -14,6 +15,18 @@
|
| display: block;
|
| }
|
|
|
| + /**
|
| + * When per-origin zooming is disabled, we change the opacity of any
|
| + * existing zoom level entries to indicate that they are not being used.
|
| + * In order to indicate that the buttons can still be used to clear the
|
| + * entries, we do not change the opacity of the buttons.
|
| + */
|
| + #listContainer[disabled] .favicon-image,
|
| + #listContainer[disabled] .middle,
|
| + #listContainer[disabled] .zoom-label {
|
| + opacity: var(--settings-disabled-opacity);
|
| + }
|
| +
|
| .zoom-label {
|
| -webkit-margin-end: 16px;
|
| }
|
| @@ -22,7 +35,16 @@
|
| margin-top: 15px;
|
| }
|
| </style>
|
| - <div class="list-frame vertical-list" id="listContainer">
|
| + <div class="settings-box first two-line">
|
| + <div class="start secondary">
|
| + [[getScopeLabel_(zoomScopeIsPerOrigin_)]]
|
| + </div>
|
| + <paper-toggle-button id="toggle" checked="{{zoomScopeIsPerOrigin_}}"
|
| + on-change="toggleZoomScope_" disabled$="[[isGuest_]]">
|
| + </paper-toggle-button>
|
| + </div>
|
| + <div class="list-frame vertical-list" id="listContainer"
|
| + disabled$="[[!zoomScopeIsPerOrigin_]]">
|
| <template is="dom-repeat" items="[[sites_]]" id="list"
|
| rendered-item-count="{{renderedCount}}">
|
| <div class="list-item">
|
| @@ -39,7 +61,8 @@
|
| </div>
|
| </div>
|
| </template>
|
| - <template is="dom-if" if="{{!renderedCount}}">
|
| + <template is="dom-if"
|
| + if="{{showNoZoomedSites_(renderedCount, zoomScopeIsPerOrigin_)}}">
|
| <div class="empty-message" id="empty">
|
| $i18n{siteSettingsNoZoomedSites}
|
| </div>
|
|
|