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

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

Issue 1219753007: Add network proxy input to md-settings internet details (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_470445_onc_proxy
Patch Set: Rebase Created 5 years, 5 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/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
2 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_chec kbox.html"> 3 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_chec kbox.html">
3 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_coll apse.html"> 4 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_coll apse.html">
4 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr _expand_button.html"> 5 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr _expand_button.html">
5 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_onc/cr_onc_types .html"> 6 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_onc/cr_onc_types .html">
6 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_network_icon/cr_ network_icon.html"> 7 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_network_icon/cr_ network_icon.html">
7 <link rel="import" href="network_ip_config.html"> 8 <link rel="import" href="network_ip_config.html">
8 <link rel="import" href="network_nameservers.html"> 9 <link rel="import" href="network_nameservers.html">
9 <link rel="import" href="network_property_list.html"> 10 <link rel="import" href="network_property_list.html">
11 <link rel="import" href="network_proxy.html">
10 12
11 <dom-module id="cr-settings-internet-detail-page"> 13 <dom-module id="cr-settings-internet-detail-page">
12 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css"> 14 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css">
13 <link rel="import" type="css" href="internet_detail_page.css"> 15 <link rel="import" type="css" href="internet_detail_page.css">
14 <template> 16 <template>
15 <paper-material class="layout vertical"> 17 <paper-material class="layout vertical">
16 <div id="outerDiv" class="layout vertical"> 18 <div id="outerDiv" class="layout vertical">
17 <div id="titleDiv" class="layout horizontal"> 19 <div id="titleDiv" class="layout horizontal">
18 <div class="layout center horizontal flex"> 20 <div class="layout center horizontal flex">
19 <cr-network-icon id="networkIcon" network-state="[[networkState]]"> 21 <cr-network-icon id="networkIcon" network-state="[[networkState]]">
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 67
66 <div id="advancedDiv" class="layout vertical" 68 <div id="advancedDiv" class="layout vertical"
67 hidden$="[[!hasAdvancedOrDeviceFields_(networkState)]]"> 69 hidden$="[[!hasAdvancedOrDeviceFields_(networkState)]]">
68 <cr-collapse opened="[[advancedExpanded]]"> 70 <cr-collapse opened="[[advancedExpanded]]">
69 <network-property-list 71 <network-property-list
70 fields="[[getAdvancedFields_(networkState)]]" 72 fields="[[getAdvancedFields_(networkState)]]"
71 network-state="[[networkState]]"> 73 network-state="[[networkState]]">
72 </network-property-list> 74 </network-property-list>
73 75
74 <div class="layout vertical" 76 <div class="layout vertical"
77 hidden$="[[!hasNetworkSection_(networkState)]]">
78 <cr-button toggles active="{{proxyExpanded}}">
79 Proxy
80 </cr-button>
81 <cr-collapse opened="[[proxyExpanded]]">
82 <div id="proxyDiv" class="layout vertical flex">
83 <network-proxy editable
84 network-state="[[networkState]]"
85 on-changed="onProxyChanged_">
86 </network-proxy>
87 </div>
88 </cr-collapse>
89 </div>
90
91 <div class="layout vertical"
75 hidden$="[[!hasDeviceFields_(networkState)]]"> 92 hidden$="[[!hasDeviceFields_(networkState)]]">
76 <cr-button toggles active="{{deviceExpanded}}"> 93 <cr-button toggles active="{{deviceExpanded}}">
77 Device 94 Device
78 </cr-button> 95 </cr-button>
79 <cr-collapse opened="[[deviceExpanded]]"> 96 <cr-collapse opened="[[deviceExpanded]]">
80 <network-property-list 97 <network-property-list
81 fields="[[getDeviceFields_(networkState)]]" 98 fields="[[getDeviceFields_(networkState)]]"
82 network-state="[[networkState]]"> 99 network-state="[[networkState]]">
83 </network-property-list> 100 </network-property-list>
84 </cr-collapse> 101 </cr-collapse>
85 </div> 102 </div>
86 </cr-collapse> 103 </cr-collapse>
87 </div> 104 </div>
88 </div> 105 </div>
89 </div> 106 </div>
90 </paper-shadow> 107 </paper-shadow>
91 </template> 108 </template>
92 <script src="internet_detail_page.js"></script> 109 <script src="internet_detail_page.js"></script>
93 </dom-module> 110 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698