| Index: chrome/browser/resources/settings/internet_page/network_proxy.html
|
| diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.html b/chrome/browser/resources/settings/internet_page/network_proxy.html
|
| index c48fcd859bf96cd18cfe7f25e654306388530956..629586123c22b8e56ed9ec290f670b91baa299ca 100644
|
| --- a/chrome/browser/resources/settings/internet_page/network_proxy.html
|
| +++ b/chrome/browser/resources/settings/internet_page/network_proxy.html
|
| @@ -4,16 +4,16 @@
|
| <link rel="import" href="chrome://resources/html/polymer.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-checkbox/paper-checkbox.html">
|
| -<link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/paper-dropdown-menu-light.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input-container.html">
|
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
|
| +<link rel="import" href="/md_select_css.html">
|
| <link rel="import" href="internet_shared_css.html">
|
| <link rel="import" href="network_proxy_exclusions.html">
|
| <link rel="import" href="network_proxy_input.html">
|
|
|
| <dom-module id="network-proxy">
|
| <template>
|
| - <style include="internet-shared">
|
| + <style include="internet-shared md-select">
|
| cr-policy-network-indicator {
|
| -webkit-margin-end: 10px;
|
| }
|
| @@ -54,16 +54,15 @@
|
| <!-- Proxy type dropdown -->
|
| <div class="settings-box continuation">
|
| <div class="start">$i18n{networkProxyConnectionType}</div>
|
| - <paper-dropdown-menu-light vertical-align="auto" no-label-float>
|
| - <paper-listbox class="dropdown-content" on-iron-activate="onTypeChange_"
|
| - selected="[[proxy.Type]]" attr-for-selected="value">
|
| + <div class="md-select-wrapper">
|
| + <select id="proxyType" class="md-select" on-change="onTypeChange_"
|
| + value="[[proxy.Type]]">
|
| <template is="dom-repeat" items="[[proxyTypes_]]">
|
| - <button class="dropdown-item" role="option" value="[[item]]">
|
| - [[proxyTypeDesc_(item)]]
|
| - </button>
|
| + <option value="[[item]]">[[proxyTypeDesc_(item)]]</option>
|
| </template>
|
| - </paper-listbox>
|
| - </paper-dropdown-menu-light>
|
| + </select>
|
| + <span class="md-select-underline"></span>
|
| + </div>
|
| </div>
|
|
|
| <!-- Autoconfiguration (PAC) -->
|
|
|