| Index: chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html
|
| diff --git a/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html b/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html
|
| index f86e431fae1a722dd333b50c1f1b9df251c94fa7..dd967ea0e78ec2da18cfa51fec7620b3f7abcaa2 100644
|
| --- a/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html
|
| +++ b/chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.html
|
| @@ -3,9 +3,10 @@
|
| <link rel="import" href="chrome://resources/html/polymer.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
|
| <link rel="import" href="autofill_section.html">
|
| <link rel="import" href="passwords_section.html">
|
| +<link rel="import" href="../controls/extension_controlled_indicator.html">
|
| +<link rel="import" href="../controls/settings_toggle_button.html">
|
| <link rel="import" href="../prefs/prefs.html">
|
| <link rel="import" href="../prefs/prefs_behavior.html">
|
| <link rel="import" href="../route.html">
|
| @@ -32,13 +33,25 @@
|
| aria-label="$i18n{autofill}"
|
| aria-describedby="autofillSecondary"></button>
|
| </div>
|
| - <div class="secondary-action">
|
| - <paper-toggle-button id="autofillToggle"
|
| - aria-label="$i18n{autofill}"
|
| - checked="{{prefs.autofill.enabled.value}}">
|
| - </paper-toggle-button>
|
| + <div class$="[[
|
| + secondaryActionClass_(prefs.autofill.enabled.value)]]">
|
| + <settings-toggle-button id="autofillToggle"
|
| + aria-label="$i18n{autofill}" no-extension-indicator
|
| + pref="{{prefs.autofill.enabled}}">
|
| + </settings-toggle-button>
|
| </div>
|
| </div>
|
| + <template is="dom-if" if="[[prefs.autofill.enabled.extensionId]]">
|
| + <div class="settings-box continuation">
|
| + <extension-controlled-indicator class="start"
|
| + id="autofillExtensionIndicator"
|
| + extension-id="[[prefs.autofill.enabled.extensionId]]"
|
| + extension-name="[[prefs.autofill.enabled.controlledByName]]"
|
| + extension-can-be-disabled="[[
|
| + prefs.autofill.enabled.extensionCanBeDisabled]]">
|
| + </extension-controlled-indicator>
|
| + </div>
|
| + </template>
|
| <div class="settings-box two-line">
|
| <div class="start two-line" on-tap="onPasswordsTap_"
|
| id="passwordManagerButton"
|
| @@ -53,13 +66,27 @@
|
| aria-label="$i18n{passwords}"
|
| aria-describedby="passwordsSecondary"></button>
|
| </div>
|
| - <div class="secondary-action">
|
| - <paper-toggle-button id="passwordToggle"
|
| - aria-label="$i18n{passwords}"
|
| - checked="{{prefs.credentials_enable_service.value}}">
|
| - </paper-toggle-button>
|
| + <div class$="[[
|
| + secondaryActionClass_(prefs.credentials_enable_service.value)]]">
|
| + <settings-toggle-button id="passwordToggle"
|
| + aria-label="$i18n{passwords}" no-extension-indicator
|
| + pref="{{prefs.credentials_enable_service}}">
|
| + </settings-toggle-button>
|
| </div>
|
| </div>
|
| + <template is="dom-if"
|
| + if="[[prefs.credentials_enable_service.extensionId]]">
|
| + <div class="settings-box continuation">
|
| + <extension-controlled-indicator class="start"
|
| + id="passwordsExtensionIndicator"
|
| + extension-id="[[prefs.credentials_enable_service.extensionId]]"
|
| + extension-name="[[
|
| + prefs.credentials_enable_service.controlledByName]]"
|
| + extension-can-be-disabled="[[
|
| + prefs.credentials_enable_service.extensionCanBeDisabled]]">
|
| + </extension-controlled-indicator>
|
| + </div>
|
| + </template>
|
| </neon-animatable>
|
| <template is="dom-if" route-path="/autofill">
|
| <settings-subpage
|
|
|