Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: chrome/browser/resources/settings/internet_page/network_proxy.html

Issue 2617533003: MD Settings: change most checkboxes to toggles (leave dialogs alone) (Closed)
Patch Set: fix tests Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
5 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 5 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
6 <link rel="import" href="chrome://resources/html/md_select_css.html"> 6 <link rel="import" href="chrome://resources/html/md_select_css.html">
7 <link rel="import" href="chrome://resources/html/polymer.html"> 7 <link rel="import" href="chrome://resources/html/polymer.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html">
11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
12 <link rel="import" href="/controls/extension_controlled_indicator.html"> 12 <link rel="import" href="/controls/extension_controlled_indicator.html">
13 <link rel="import" href="/controls/settings_checkbox.html"> 13 <link rel="import" href="/controls/settings_toggle_button.html">
14 <link rel="import" href="/i18n_setup.html"> 14 <link rel="import" href="/i18n_setup.html">
15 <link rel="import" href="/prefs/prefs_behavior.html"> 15 <link rel="import" href="/prefs/prefs_behavior.html">
16 <link rel="import" href="/settings_vars_css.html"> 16 <link rel="import" href="/settings_vars_css.html">
17 <link rel="import" href="internet_shared_css.html"> 17 <link rel="import" href="internet_shared_css.html">
18 <link rel="import" href="network_proxy_exclusions.html"> 18 <link rel="import" href="network_proxy_exclusions.html">
19 <link rel="import" href="network_proxy_input.html"> 19 <link rel="import" href="network_proxy_input.html">
20 20
21 <dom-module id="network-proxy"> 21 <dom-module id="network-proxy">
22 <template> 22 <template>
23 <style include="internet-shared md-select"> 23 <style include="internet-shared md-select">
(...skipping 16 matching lines...) Expand all
40 } 40 }
41 41
42 #exceptionsDiv { 42 #exceptionsDiv {
43 padding: 10px 0; 43 padding: 10px 0;
44 } 44 }
45 45
46 #exceptionsDiv network-proxy-exclusions { 46 #exceptionsDiv network-proxy-exclusions {
47 margin: 10px 0; 47 margin: 10px 0;
48 } 48 }
49 49
50 #proxyDiv paper-checkbox { 50 #proxyDiv paper-toggle-button {
51 padding: 10px 0; 51 padding: 10px 0;
52 } 52 }
53 </style> 53 </style>
54 54
55 <!-- Policy indicator. Only one dom-if below will be shown. --> 55 <!-- Policy indicator. Only one dom-if below will be shown. -->
56 <template is="dom-if" 56 <template is="dom-if"
57 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]"> 57 if="[[shouldShowNetworkPolicyIndicator_(networkProperties)]]">
58 <div class="settings-box continuation single-column"> 58 <div class="settings-box continuation single-column">
59 <div class="layout horizontal center"> 59 <div class="layout horizontal center">
60 <cr-policy-network-indicator 60 <cr-policy-network-indicator
(...skipping 11 matching lines...) Expand all
72 extension-name="[[prefs.proxy.controlledByName]]" 72 extension-name="[[prefs.proxy.controlledByName]]"
73 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"> 73 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]">
74 </extension-controlled-indicator> 74 </extension-controlled-indicator>
75 </div> 75 </div>
76 </template> 76 </template>
77 77
78 <!-- Allow shared proxies --> 78 <!-- Allow shared proxies -->
79 <div class="settings-box continuation" 79 <div class="settings-box continuation"
80 hidden$="[[!shouldShowAllowShared_( 80 hidden$="[[!shouldShowAllowShared_(
81 networkProperties.ProxySettings.Type)]]"> 81 networkProperties.ProxySettings.Type)]]">
82 <settings-checkbox id="allowShared" 82 <settings-toggle-button id="allowShared" class="start"
83 pref="{{prefs.settings.use_shared_proxies}}" 83 pref="{{prefs.settings.use_shared_proxies}}"
84 no-set-pref label="$i18n{networkProxyAllowShared}" 84 label="$i18n{networkProxyAllowShared}"
85 on-change="onAllowSharedProxiesChange_"> 85 on-change="onAllowSharedProxiesChange_"
86 </settings-checkbox> 86 no-set-pref>
87 </settings-toggle-button>
87 </div> 88 </div>
88 89
89 <!-- Proxy type dropdown --> 90 <!-- Proxy type dropdown -->
90 <div class="settings-box continuation"> 91 <div class="settings-box continuation">
91 <div class="start">$i18n{networkProxyConnectionType}</div> 92 <div class="start">$i18n{networkProxyConnectionType}</div>
92 <div class="md-select-wrapper"> 93 <div class="md-select-wrapper">
93 <select id="proxyType" class="md-select" on-change="onTypeChange_" 94 <select id="proxyType" class="md-select" on-change="onTypeChange_"
94 value="[[proxy_.Type]]" 95 value="[[proxy_.Type]]"
95 disabled="[[!isEditable_('Type', networkProperties, editable, 96 disabled="[[!isEditable_('Type', networkProperties, editable,
96 useSharedProxies_)]]"> 97 useSharedProxies_)]]">
(...skipping 19 matching lines...) Expand all
116 <!-- Web Proxy Auto Discovery (WPAD) --> 117 <!-- Web Proxy Auto Discovery (WPAD) -->
117 <div class="settings-box continuation indent" 118 <div class="settings-box continuation indent"
118 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]"> 119 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.WPAD)]]">
119 <div>$i18n{networkSectionWpad}</div> 120 <div>$i18n{networkSectionWpad}</div>
120 <div class="middle flex">[[WPAD_]]</div> 121 <div class="middle flex">[[WPAD_]]</div>
121 </div> 122 </div>
122 123
123 <!-- Manual --> 124 <!-- Manual -->
124 <div id="proxyDiv" class="settings-box continuation single-column indent" 125 <div id="proxyDiv" class="settings-box continuation single-column indent"
125 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]"> 126 hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]">
126 <paper-checkbox checked="{{useSameProxy_}}" 127 <div class="flex layout horizontal">
127 disabled="[[!isEditable_('Type', networkProperties, editable, 128 <div class="flex">$i18n{networkProxyUseSame}</div>
128 useSharedProxies_)]]"> 129 <paper-toggle-button checked="{{useSameProxy_}}"
129 $i18n{networkProxyUseSame} 130 disabled="[[!isEditable_('Type', networkProperties, editable,
130 </paper-checkbox> 131 useSharedProxies_)]]">
132 </paper-toggle-button>
133 </div>
131 <div hidden$="[[!useSameProxy_]]" class="layout vertical"> 134 <div hidden$="[[!useSameProxy_]]" class="layout vertical">
132 <network-proxy-input 135 <network-proxy-input
133 on-proxy-change="onProxyInputChange_" 136 on-proxy-change="onProxyInputChange_"
134 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties, 137 editable="[[isEditable_('Manual.HTTPProxy.Host', networkProperties,
135 editable, useSharedProxies_)]]" 138 editable, useSharedProxies_)]]"
136 value="{{proxy_.Manual.HTTPProxy}}" 139 value="{{proxy_.Manual.HTTPProxy}}"
137 label="$i18n{networkProxy}"> 140 label="$i18n{networkProxy}">
138 </network-proxy-input> 141 </network-proxy-input>
139 </div> 142 </div>
140 <div hidden$="[[useSameProxy_]]" class="layout vertical"> 143 <div hidden$="[[useSameProxy_]]" class="layout vertical">
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 </paper-button> 208 </paper-button>
206 <paper-button class="action-button" 209 <paper-button class="action-button"
207 on-tap="onAllowSharedDialogConfirm_"> 210 on-tap="onAllowSharedDialogConfirm_">
208 $i18n{confirm} 211 $i18n{confirm}
209 </paper-button> 212 </paper-button>
210 </div> 213 </div>
211 </dialog> 214 </dialog>
212 </template> 215 </template>
213 <script src="network_proxy.js"></script> 216 <script src="network_proxy.js"></script>
214 </dom-module> 217 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698