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

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

Issue 2224613003: Switch MD Settings to paper-dropdown-menu-light (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@RollPaperDropdown
Patch Set: rebase Created 4 years, 3 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/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu-light.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input -container.html">
6 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 7 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> 8 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
8 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> 9 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
9 <link rel="import" href="internet_shared_css.html"> 10 <link rel="import" href="internet_shared_css.html">
10 <link rel="import" href="network_property_list.html"> 11 <link rel="import" href="network_property_list.html">
11 <link rel="import" href="network_proxy_input.html"> 12 <link rel="import" href="network_proxy_input.html">
12 <link rel="import" href="network_proxy_exclusions.html"> 13 <link rel="import" href="network_proxy_exclusions.html">
13 14
(...skipping 28 matching lines...) Expand all
42 <cr-policy-network-indicator 43 <cr-policy-network-indicator
43 property="[[networkProperties.ProxySettings.Type]]"> 44 property="[[networkProperties.ProxySettings.Type]]">
44 </cr-policy-network-indicator> 45 </cr-policy-network-indicator>
45 <div>This proxy is enforced by your administrator.</div> 46 <div>This proxy is enforced by your administrator.</div>
46 </div> 47 </div>
47 </div> 48 </div>
48 49
49 <!-- Proxy type dropdown --> 50 <!-- Proxy type dropdown -->
50 <div class="settings-box continuation"> 51 <div class="settings-box continuation">
51 <div class="start">Connection type</div> 52 <div class="start">Connection type</div>
52 <paper-dropdown-menu vertical-align="auto" no-label-float> 53 <paper-dropdown-menu-light vertical-align="auto" no-label-float>
53 <paper-listbox class="dropdown-content" on-iron-activate="onTypeChange_" 54 <paper-listbox class="dropdown-content" on-iron-activate="onTypeChange_"
54 selected="[[proxy.Type]]" attr-for-selected="value"> 55 selected="[[proxy.Type]]" attr-for-selected="value">
55 <template is="dom-repeat" items="[[proxyTypes_]]"> 56 <template is="dom-repeat" items="[[proxyTypes_]]">
56 <button class="dropdown-item" role="option" value="[[item]]"> 57 <button class="dropdown-item" role="option" value="[[item]]">
57 [[proxyTypeDesc_(item)]] 58 [[proxyTypeDesc_(item)]]
58 </button> 59 </button>
59 </template> 60 </template>
60 </paper-listbox> 61 </paper-listbox>
61 </paper-dropdown-menu> 62 </paper-dropdown-menu-light>
62 </div> 63 </div>
63 64
64 <!-- Autoconfiguration (PAC) --> 65 <!-- Autoconfiguration (PAC) -->
65 <div class="settings-box continuation indented" 66 <div class="settings-box continuation indented"
66 hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]"> 67 hidden$="[[!matches_(proxy.Type, ProxySettingsType.PAC)]]">
67 <div class="start">Autoconfiguration URL:</div> 68 <div class="start">Autoconfiguration URL:</div>
68 <paper-input no-label-float class="flex" value="{{proxy.PAC}}" 69 <paper-input no-label-float class="flex" value="{{proxy.PAC}}"
69 disabled="[[isNetworkPolicyEnforced( 70 disabled="[[isNetworkPolicyEnforced(
70 networkProperties.ProxySettings.PAC)]]" 71 networkProperties.ProxySettings.PAC)]]"
71 on-blur="onProxyInputChange_"> 72 on-blur="onProxyInputChange_">
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 </paper-input-container> 128 </paper-input-container>
128 <paper-button on-tap="onAddProxyExclusionTap_"> 129 <paper-button on-tap="onAddProxyExclusionTap_">
129 Add Exception 130 Add Exception
130 </paper-button> 131 </paper-button>
131 </div> 132 </div>
132 </div> 133 </div>
133 </div> 134 </div>
134 </template> 135 </template>
135 <script src="network_proxy.js"></script> 136 <script src="network_proxy.js"></script>
136 </dom-module> 137 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698