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

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

Issue 1390073006: Add cr-policy-network-indicator to internet pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_521791_network_indicators_c3
Patch Set: Formatting fixes Created 5 years, 2 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/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
7 <link rel="import" href="chrome://resources/cr_elements/cr_collapse/cr_collapse. html"> 7 <link rel="import" href="chrome://resources/cr_elements/cr_collapse/cr_collapse. html">
8 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 8 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
9 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> 9 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">
10 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 10 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
11 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
12 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
11 <link rel="import" href="network_apnlist.html"> 13 <link rel="import" href="network_apnlist.html">
12 <link rel="import" href="network_ip_config.html"> 14 <link rel="import" href="network_ip_config.html">
13 <link rel="import" href="network_nameservers.html"> 15 <link rel="import" href="network_nameservers.html">
14 <link rel="import" href="network_property_list.html"> 16 <link rel="import" href="network_property_list.html">
15 <link rel="import" href="network_proxy.html"> 17 <link rel="import" href="network_proxy.html">
16 <link rel="import" href="network_siminfo.html"> 18 <link rel="import" href="network_siminfo.html">
17 19
18 <dom-module id="settings-internet-detail-page"> 20 <dom-module id="settings-internet-detail-page">
19 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css"> 21 <link rel="import" type="css" href="chrome://md-settings/settings_page/setting s_page.css">
20 <link rel="import" type="css" href="internet_detail_page.css"> 22 <link rel="import" type="css" href="internet_detail_page.css">
(...skipping 13 matching lines...) Expand all
34 <!-- For Cellular, show SIM info first. --> 36 <!-- For Cellular, show SIM info first. -->
35 <div class="layout vertical section"> 37 <div class="layout vertical section">
36 <network-siminfo editable 38 <network-siminfo editable
37 hidden$="[[!showCellularSim_(networkProperties)]]" 39 hidden$="[[!showCellularSim_(networkProperties)]]"
38 network-properties="[[networkProperties]]" 40 network-properties="[[networkProperties]]"
39 on-siminfo-change="onNetworkPropertyChange_"> 41 on-siminfo-change="onNetworkPropertyChange_">
40 </network-siminfo> 42 </network-siminfo>
41 </div> 43 </div>
42 44
43 <!-- Info and properties common to all networks. --> 45 <!-- Info and properties common to all networks. -->
44 <div id="infoDiv" class="layout vertical"> 46 <div class="layout vertical">
45 <div class="layout horizontal section" hidden$="[[!IPAddress]]"> 47 <div class="layout horizontal section" hidden$="[[!IPAddress]]">
46 <span id="ipAddressLabel">IP Address:</span> 48 <span id="ipAddressLabel">IP Address:</span>
47 <span>[[IPAddress]]</span> 49 <span>[[IPAddress]]</span>
48 </div> 50 </div>
49 <div class="section"> 51 <div class="section">
50 <span hidden$="[[!showShared_(networkProperties)]]"> 52 <span hidden$="[[!showShared_(networkProperties)]]">
51 This network is shared with other users. 53 This network is shared with other users.
52 </span> 54 </span>
53 </div> 55 </div>
54 <div class="layout horizontal center section" 56 <div class="layout horizontal center section"
55 hidden$="[[!showPreferNetwork_(networkProperties)]]"> 57 hidden$="[[!showPreferNetwork_(networkProperties)]]">
56 <paper-icon-button id="preferButton" 58 <paper-icon-button id="preferButton" toggles
57 toggles active="{{preferNetwork}}" 59 active="{{preferNetwork}}"
60 disabled=
61 "[[isNetworkPolicyEnforced(networkProperties.Priority)]]"
58 icon="[[getPreferredIcon_(preferNetwork)]]"> 62 icon="[[getPreferredIcon_(preferNetwork)]]">
59 </paper-icon-button> 63 </paper-icon-button>
60 <span>Prefer this network</span> 64 <span>Prefer this network</span>
65 <cr-policy-network-indicator
66 property="[[networkProperties.Priority]]">
67 </cr-policy-network-indicator>
61 </div> 68 </div>
62 <div class="section"> 69 <div class="layout horizontal center section"
63 <paper-checkbox checked="{{autoConnect}}" 70 hidden$="[[!showAutoConnect_(networkProperties)]]">
64 hidden$="[[!showAutoConnect_(networkProperties)]]"> 71 <paper-checkbox checked="{{autoConnect}}">
65 Automatically connect to this network 72 Automatically connect to this network
66 </paper-checkbox> 73 </paper-checkbox>
74 <cr-policy-network-indicator
75 property="[[getManagedAutoConnect_(networkProperties)]]">
76 </cr-policy-network-indicator>
67 </div> 77 </div>
68 <!-- Properties to always show if present. --> 78 <!-- Properties to always show if present. -->
69 <div class="section"> 79 <div class="section">
70 <network-property-list 80 <network-property-list
71 fields="[[getInfoFields_(networkProperties)]]" 81 fields="[[getInfoFields_(networkProperties)]]"
72 property-dict="[[networkProperties]]"> 82 property-dict="[[networkProperties]]">
73 </network-property-list> 83 </network-property-list>
74 </div> 84 </div>
75 </div> 85 </div>
76 86
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 </network-property-list> 182 </network-property-list>
173 </cr-collapse> 183 </cr-collapse>
174 </div> 184 </div>
175 </cr-collapse> 185 </cr-collapse>
176 </div> 186 </div>
177 </div> 187 </div>
178 </div> 188 </div>
179 </template> 189 </template>
180 <script src="internet_detail_page.js"></script> 190 <script src="internet_detail_page.js"></script>
181 </dom-module> 191 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698