diff options
Diffstat (limited to 'chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html')
-rw-r--r-- | chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html index 200cf41ad3c..4445ba1a4f1 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html +++ b/chromium/chrome/browser/resources/settings/internet_page/internet_detail_page.html @@ -9,6 +9,7 @@ <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_network_icon.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/network/cr_onc_types.html"> <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expand_button.html"> +<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html"> <link rel="import" href="chrome://resources/cr_elements/icons.html"> <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicator.html"> <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html"> @@ -18,7 +19,6 @@ <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> -<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html"> <link rel="import" href="../controls/settings_toggle_button.html"> <link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../route.html"> @@ -41,7 +41,7 @@ -webkit-margin-end: 10px; } - paper-toggle-button { + cr-toggle { -webkit-margin-start: var(--settings-control-label-spacing); } @@ -80,31 +80,29 @@ </cr-policy-indicator> </template> </div> - <template is="dom-if" if="[[!isSecondaryUser_]]"> - <paper-button on-click="onForgetTap_" - hidden$="[[!showForget_(networkProperties)]]"> - $i18n{networkButtonForget} - </paper-button> - <paper-button on-click="onViewAccountTap_" - hidden$="[[!showViewAccount_(networkProperties)]]"> - $i18n{networkButtonViewAccount} - </paper-button> - <paper-button on-click="onActivateTap_" - hidden$="[[!showActivate_(networkProperties)]]"> - $i18n{networkButtonActivate} - </paper-button> - <paper-button on-click="onConfigureTap_" - hidden$="[[!showConfigure_(networkProperties, globalPolicy)]]"> - $i18n{networkButtonConfigure} - </paper-button> - </template> - <paper-button class="primary-button" on-click="onConnectTap_" + <paper-button on-click="onForgetTap_" + hidden$="[[!showForget_(networkProperties)]]"> + $i18n{networkButtonForget} + </paper-button> + <paper-button on-click="onViewAccountTap_" + hidden$="[[!showViewAccount_(networkProperties)]]"> + $i18n{networkButtonViewAccount} + </paper-button> + <paper-button on-click="onActivateTap_" + hidden$="[[!showActivate_(networkProperties)]]"> + $i18n{networkButtonActivate} + </paper-button> + <paper-button on-click="onConfigureTap_" + hidden$="[[!showConfigure_(networkProperties, globalPolicy)]]"> + $i18n{networkButtonConfigure} + </paper-button> + <paper-button class="action-button" on-click="onConnectTap_" hidden$="[[!showConnect_(networkProperties, globalPolicy)]]" disabled="[[!enableConnect_(networkProperties, defaultNetwork, globalPolicy, networkPropertiesReceived_, outOfRange_)]]"> $i18n{networkButtonConnect} </paper-button> - <paper-button class="primary-button" on-click="onDisconnectTap_" + <paper-button class="action-button" on-click="onDisconnectTap_" hidden$="[[!showDisconnect_(networkProperties)]]"> $i18n{networkButtonDisconnect} </paper-button> @@ -141,10 +139,10 @@ <cr-policy-network-indicator property="[[networkProperties.Priority]]"> </cr-policy-network-indicator> - <paper-toggle-button checked="{{preferNetwork_}}" + <cr-toggle checked="{{preferNetwork_}}" disabled="[[isNetworkPolicyEnforced(networkProperties.Priority)]]" aria-labelledby="preferNetworkToggleLabel"> - </paper-toggle-button> + </cr-toggle> </div> </template> <!-- Autoconnect. --> @@ -156,11 +154,11 @@ <cr-policy-network-indicator property="[[getManagedAutoConnect_(networkProperties)]]"> </cr-policy-network-indicator> - <paper-toggle-button checked="{{autoConnect_}}" + <cr-toggle checked="{{autoConnect_}}" disabled="[[!enableAutoConnect_(networkProperties, globalPolicy)]]" aria-labelledby="autoConnectToggleLabel"> - </paper-toggle-button> + </cr-toggle> </div> </template> <!-- Data roaming (Cellular only). --> |