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

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

Issue 2625213002: WebUI: Add cr_policy_network_indicator_tests.js (Closed)
Patch Set: . Created 3 years, 9 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/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/icons.html"> 2 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">
4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
5 <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 _behavior.html">
6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
8 <link rel="import" href="chrome://resources/html/polymer.html"> 9 <link rel="import" href="chrome://resources/html/polymer.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 11 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
11 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 12 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
13 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
14 <link rel="import" href="../prefs/prefs.html"> 15 <link rel="import" href="../prefs/prefs.html">
15 <link rel="import" href="../route.html"> 16 <link rel="import" href="../route.html">
16 <link rel="import" href="internet_shared_css.html"> 17 <link rel="import" href="internet_shared_css.html">
(...skipping 17 matching lines...) Expand all
34 35
35 iron-collapse { 36 iron-collapse {
36 margin: 10px 0; 37 margin: 10px 0;
37 } 38 }
38 39
39 iron-icon { 40 iron-icon {
40 -webkit-margin-end: 10px; 41 -webkit-margin-end: 10px;
41 } 42 }
42 43
43 paper-toggle-button, 44 paper-toggle-button,
44 cr-policy-network-indicator { 45 cr-policy-network-indicator {
Dan Beam 2017/03/09 00:57:45 does this need another element in this selector?
stevenjb 2017/03/09 01:12:24 Ah, yes, thanks. Done.
45 -webkit-margin-start: var(--checkbox-spacing); 46 -webkit-margin-start: var(--checkbox-spacing);
46 } 47 }
47 48
48 /* Use <span> for subtitles so as not to interfere with 49 /* Use <span> for subtitles so as not to interfere with
49 * settings-box:first-of-type. */ 50 * settings-box:first-of-type. */
50 span.subtitle { 51 span.subtitle {
51 font-weight: 700; 52 font-weight: 700;
52 padding: 20px; 53 padding: 20px;
53 } 54 }
54 55
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 <div class="settings-box first"> 88 <div class="settings-box first">
88 <div class="start layout horizontal center"> 89 <div class="start layout horizontal center">
89 <cr-network-icon network-state="[[networkProperties]]"> 90 <cr-network-icon network-state="[[networkProperties]]">
90 </cr-network-icon> 91 </cr-network-icon>
91 <div id="networkState" 92 <div id="networkState"
92 connected$="[[isConnectedState_(networkProperties)]]"> 93 connected$="[[isConnectedState_(networkProperties)]]">
93 [[getStateText_(networkProperties)]] 94 [[getStateText_(networkProperties)]]
94 </div> 95 </div>
95 <template is="dom-if" 96 <template is="dom-if"
96 if="[[isPolicySource(networkProperties.Source))]]"> 97 if="[[isPolicySource(networkProperties.Source))]]">
97 <cr-policy-network-indicator 98 <cr-policy-pref-indicator
98 indicator-type="[[getIndicatorTypeForSource( 99 indicator-type="[[getIndicatorTypeForSource(
99 networkProperties.Source)]]"> 100 networkProperties.Source)]]">
100 </cr-policy-network-indicator> 101 </cr-policy-pref-indicator>
101 </template> 102 </template>
102 </div> 103 </div>
103 <div id="buttonDiv" class="layout horizontal center"> 104 <div id="buttonDiv" class="layout horizontal center">
104 <template is="dom-if" if="[[!isSecondaryUser_]]"> 105 <template is="dom-if" if="[[!isSecondaryUser_]]">
105 <paper-button class="secondary-button" on-tap="onForgetTap_" 106 <paper-button class="secondary-button" on-tap="onForgetTap_"
106 hidden$="[[!showForget_(networkProperties)]]"> 107 hidden$="[[!showForget_(networkProperties)]]">
107 $i18n{networkButtonForget} 108 $i18n{networkButtonForget}
108 </paper-button> 109 </paper-button>
109 <paper-button class="secondary-button" on-tap="onViewAccountTap_" 110 <paper-button class="secondary-button" on-tap="onViewAccountTap_"
110 hidden$="[[!showViewAccount_(networkProperties)]]"> 111 hidden$="[[!showViewAccount_(networkProperties)]]">
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 on-proxy-change="onProxyChange_" 273 on-proxy-change="onProxyChange_"
273 network-properties="[[networkProperties]]"> 274 network-properties="[[networkProperties]]">
274 </network-proxy> 275 </network-proxy>
275 </template> 276 </template>
276 </div> 277 </div>
277 </iron-collapse> 278 </iron-collapse>
278 </template> 279 </template>
279 </template> 280 </template>
280 <script src="internet_detail_page.js"></script> 281 <script src="internet_detail_page.js"></script>
281 </dom-module> 282 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698