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

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

Issue 2744923002: cr-policy-indicator element for non-preference-based indicators (Closed)
Patch Set: alphabetize 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_indicat or.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 _behavior.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_network _indicator.html">
7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
9 <link rel="import" href="chrome://resources/html/polymer.html"> 9 <link rel="import" href="chrome://resources/html/polymer.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-collapse/iron-coll apse.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-flex-layout/classe s/iron-flex-layout.html">
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/iron-icon/iron-icon.htm l">
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-button/paper-butt on.html">
14 <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">
15 <link rel="import" href="../prefs/prefs.html"> 15 <link rel="import" href="../prefs/prefs.html">
16 <link rel="import" href="../route.html"> 16 <link rel="import" href="../route.html">
17 <link rel="import" href="internet_shared_css.html"> 17 <link rel="import" href="internet_shared_css.html">
(...skipping 18 matching lines...) Expand all
36 iron-collapse { 36 iron-collapse {
37 margin: 10px 0; 37 margin: 10px 0;
38 } 38 }
39 39
40 iron-icon { 40 iron-icon {
41 -webkit-margin-end: 10px; 41 -webkit-margin-end: 10px;
42 } 42 }
43 43
44 paper-toggle-button, 44 paper-toggle-button,
45 cr-policy-network-indicator, 45 cr-policy-network-indicator,
46 cr-policy-pref-indicator { 46 cr-policy-indicator {
47 -webkit-margin-start: var(--settings-control-spacing); 47 -webkit-margin-start: var(--settings-control-spacing);
48 } 48 }
49 49
50 /* Use <span> for subtitles so as not to interfere with 50 /* Use <span> for subtitles so as not to interfere with
51 * settings-box:first-of-type. */ 51 * settings-box:first-of-type. */
52 span.subtitle { 52 span.subtitle {
53 font-weight: 700; 53 font-weight: 700;
54 padding: 20px; 54 padding: 20px;
55 } 55 }
56 56
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 <div class="settings-box first"> 89 <div class="settings-box first">
90 <div class="start layout horizontal center"> 90 <div class="start layout horizontal center">
91 <cr-network-icon network-state="[[networkProperties]]"> 91 <cr-network-icon network-state="[[networkProperties]]">
92 </cr-network-icon> 92 </cr-network-icon>
93 <div id="networkState" 93 <div id="networkState"
94 connected$="[[isConnectedState_(networkProperties)]]"> 94 connected$="[[isConnectedState_(networkProperties)]]">
95 [[getStateText_(networkProperties)]] 95 [[getStateText_(networkProperties)]]
96 </div> 96 </div>
97 <template is="dom-if" 97 <template is="dom-if"
98 if="[[isPolicySource(networkProperties.Source))]]"> 98 if="[[isPolicySource(networkProperties.Source))]]">
99 <cr-policy-pref-indicator 99 <cr-policy-indicator
100 indicator-type="[[getIndicatorTypeForSource( 100 indicator-type="[[getIndicatorTypeForSource(
101 networkProperties.Source)]]"> 101 networkProperties.Source)]]">
102 </cr-policy-pref-indicator> 102 </cr-policy-indicator>
103 </template> 103 </template>
104 </div> 104 </div>
105 <div id="buttonDiv" class="layout horizontal center"> 105 <div id="buttonDiv" class="layout horizontal center">
106 <template is="dom-if" if="[[!isSecondaryUser_]]"> 106 <template is="dom-if" if="[[!isSecondaryUser_]]">
107 <paper-button class="secondary-button" on-tap="onForgetTap_" 107 <paper-button class="secondary-button" on-tap="onForgetTap_"
108 hidden$="[[!showForget_(networkProperties)]]"> 108 hidden$="[[!showForget_(networkProperties)]]">
109 $i18n{networkButtonForget} 109 $i18n{networkButtonForget}
110 </paper-button> 110 </paper-button>
111 <paper-button class="secondary-button" on-tap="onViewAccountTap_" 111 <paper-button class="secondary-button" on-tap="onViewAccountTap_"
112 hidden$="[[!showViewAccount_(networkProperties)]]"> 112 hidden$="[[!showViewAccount_(networkProperties)]]">
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 on-proxy-change="onProxyChange_" 274 on-proxy-change="onProxyChange_"
275 network-properties="[[networkProperties]]"> 275 network-properties="[[networkProperties]]">
276 </network-proxy> 276 </network-proxy>
277 </template> 277 </template>
278 </div> 278 </div>
279 </iron-collapse> 279 </iron-collapse>
280 </template> 280 </template>
281 </template> 281 </template>
282 <script src="internet_detail_page.js"></script> 282 <script src="internet_detail_page.js"></script>
283 </dom-module> 283 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698