Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> | 2 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> | 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> |
| 4 <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 _behavior.html"> |
| 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> |
| 6 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 6 <link rel="import" href="chrome://resources/html/i18n_behavior.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/iron-collapse/iron-coll apse.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 84 </style> | 84 </style> |
| 85 <!-- Title section: Icon + name + connection state. --> | 85 <!-- Title section: Icon + name + connection state. --> |
| 86 <div class="settings-box first"> | 86 <div class="settings-box first"> |
| 87 <div class="start layout horizontal center"> | 87 <div class="start layout horizontal center"> |
| 88 <cr-network-icon network-state="[[networkProperties]]"> | 88 <cr-network-icon network-state="[[networkProperties]]"> |
| 89 </cr-network-icon> | 89 </cr-network-icon> |
| 90 <div id="networkState" | 90 <div id="networkState" |
| 91 connected$="[[isConnectedState_(networkProperties)]]"> | 91 connected$="[[isConnectedState_(networkProperties)]]"> |
| 92 [[getStateText_(networkProperties)]] | 92 [[getStateText_(networkProperties)]] |
| 93 </div> | 93 </div> |
| 94 <template is="dom-if" | |
| 95 if="[[isPolicySource(networkProperties.Source))]]"> | |
| 96 <cr-policy-network-indicator | |
| 97 indicator-type="[[getIndicatorTypeForSource( | |
| 98 networkProperties.Source)]]"> | |
|
Dan Beam
2016/11/29 05:25:34
indent off, I think we've generally lined these up
stevenjb
2016/11/30 22:58:19
Meh. My editor likes to do it this way. I'm sure w
| |
| 99 </cr-policy-network-indicator> | |
| 100 </template> | |
| 94 </div> | 101 </div> |
| 95 <div id="buttonDiv" class="layout horizontal center"> | 102 <div id="buttonDiv" class="layout horizontal center"> |
| 96 <paper-button class="secondary-button" on-tap="onForgetTap_" | 103 <paper-button class="secondary-button" on-tap="onForgetTap_" |
| 97 hidden$="[[!showForget_(networkProperties)]]"> | 104 hidden$="[[!showForget_(networkProperties)]]"> |
| 98 $i18n{networkButtonForget} | 105 $i18n{networkButtonForget} |
| 99 </paper-button> | 106 </paper-button> |
| 100 <paper-button class="secondary-button" on-tap="onViewAccountTap_" | 107 <paper-button class="secondary-button" on-tap="onViewAccountTap_" |
| 101 hidden$="[[!showViewAccount_(networkProperties)]]"> | 108 hidden$="[[!showViewAccount_(networkProperties)]]"> |
| 102 $i18n{networkButtonViewAccount} | 109 $i18n{networkButtonViewAccount} |
| 103 </paper-button> | 110 </paper-button> |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 126 hidden$="[[!showShared_(networkProperties)]]"> | 133 hidden$="[[!showShared_(networkProperties)]]"> |
| 127 $i18n{networkShared} | 134 $i18n{networkShared} |
| 128 </div> | 135 </div> |
| 129 <!-- Top level properties --> | 136 <!-- Top level properties --> |
| 130 <div class="layout vertical"> | 137 <div class="layout vertical"> |
| 131 <!-- Prefer this network. --> | 138 <!-- Prefer this network. --> |
| 132 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> | 139 <template is="dom-if" if="[[showPreferNetwork_(networkProperties))]]"> |
| 133 <div class="settings-box"> | 140 <div class="settings-box"> |
| 134 <paper-checkbox checked="{{preferNetwork_}}" | 141 <paper-checkbox checked="{{preferNetwork_}}" |
| 135 disabled="[[isNetworkPolicyEnforced( | 142 disabled="[[isNetworkPolicyEnforced( |
| 136 networkProperties.Priority)]]"> | 143 networkProperties.Priority)]]"> |
| 137 $i18n{networkPrefer} | 144 $i18n{networkPrefer} |
| 138 </paper-checkbox> | 145 </paper-checkbox> |
| 139 <cr-policy-network-indicator | 146 <cr-policy-network-indicator |
| 140 property="[[networkProperties.Priority]]"> | 147 property="[[networkProperties.Priority]]"> |
| 141 </cr-policy-network-indicator> | 148 </cr-policy-network-indicator> |
| 142 </div> | 149 </div> |
| 143 </template> | 150 </template> |
| 144 <!-- Autoconnect. --> | 151 <!-- Autoconnect. --> |
| 145 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> | 152 <template is="dom-if" if="[[showAutoConnect_(networkProperties)]]"> |
| 146 <div class="settings-box"> | 153 <div class="settings-box"> |
| 147 <paper-checkbox checked="{{autoConnect_}}"> | 154 <paper-checkbox checked="{{autoConnect_}}" |
| 155 disabled="[[isNetworkPolicyEnforced( | |
| 156 getManagedAutoConnect_(networkProperties))]]"> | |
| 148 $i18n{networkAutoConnect} | 157 $i18n{networkAutoConnect} |
| 149 </paper-checkbox> | 158 </paper-checkbox> |
| 150 <cr-policy-network-indicator | 159 <cr-policy-network-indicator |
| 151 property="[[getManagedAutoConnect_(networkProperties)]]"> | 160 property="[[getManagedAutoConnect_(networkProperties)]]"> |
| 152 </cr-policy-network-indicator> | 161 </cr-policy-network-indicator> |
| 153 </div> | 162 </div> |
| 154 </template> | 163 </template> |
| 155 <!-- SIM Info (Cellular only). --> | 164 <!-- SIM Info (Cellular only). --> |
| 156 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> | 165 <template is="dom-if" if="[[showCellularSim_(networkProperties)]]"> |
| 157 <div class="settings-box single-column stretch"> | 166 <div class="settings-box single-column stretch"> |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 235 <network-proxy editable prefs="{{prefs}}" | 244 <network-proxy editable prefs="{{prefs}}" |
| 236 on-proxy-change="onProxyChange_" | 245 on-proxy-change="onProxyChange_" |
| 237 network-properties="[[networkProperties]]"> | 246 network-properties="[[networkProperties]]"> |
| 238 </network-proxy> | 247 </network-proxy> |
| 239 </template> | 248 </template> |
| 240 </div> | 249 </div> |
| 241 </iron-collapse> | 250 </iron-collapse> |
| 242 </template> | 251 </template> |
| 243 <script src="internet_detail_page.js"></script> | 252 <script src="internet_detail_page.js"></script> |
| 244 </dom-module> | 253 </dom-module> |
| OLD | NEW |