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

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

Issue 2824493003: MD Settings: Elim is-list-item from cr-network-list-item (Closed)
Patch Set: Fix function definition Created 3 years, 8 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/network/cr_network_list. html"> 1 <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_list_ item.html"> 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat or.html">
3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
4 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
8 <link rel="import" href="../settings_page/settings_subpage.html"> 8 <link rel="import" href="../settings_page/settings_subpage.html">
9 <link rel="import" href="../settings_shared_css.html"> 9 <link rel="import" href="../settings_shared_css.html">
10 <link rel="import" href="network_siminfo.html"> 10 <link rel="import" href="network_siminfo.html">
11 11
12 <dom-module id="network-summary-item"> 12 <dom-module id="network-summary-item">
13 <template> 13 <template>
14 <style include="settings-shared"> 14 <style include="settings-shared">
15 cr-network-icon {
16 -webkit-padding-end: var(--settings-box-row-padding);
17 }
18
15 network-siminfo { 19 network-siminfo {
16 padding: 0 var(--settings-box-row-padding); 20 padding: 0 var(--settings-box-row-padding);
17 } 21 }
18 22
19 #details { 23 #details {
20 align-items: center; 24 align-items: center;
21 display: flex; 25 display: flex;
22 flex: auto; 26 flex: auto;
23 } 27 }
24 28
25 #details[no-flex] { 29 #networkName {
26 flex: none; 30 color: #333;
31 font-weight: 500;
32 }
33
34 #networkState {
35 color: var(--paper-grey-600);
36 font-size: inherit;
37 font-weight: 400;
27 } 38 }
28 </style> 39 </style>
29 <div actionable class="settings-box two-line" on-tap="onShowDetailsTap_"> 40 <div actionable class="settings-box two-line" on-tap="onShowDetailsTap_">
30 <div id="details" no-flex$="[[showSimInfo_(deviceState)]]"> 41 <div id="details" no-flex$="[[showSimInfo_(deviceState)]]">
31 <cr-network-list-item item="[[activeNetworkState]]" class="flex"> 42 <cr-network-icon network-state="[[activeNetworkState]]">
32 </cr-network-list-item> 43 </cr-network-icon>
44 <div class="flex">
45 <div id="networkName">[[getNetworkName_(activeNetworkState)]]</div>
46 <div id="networkState">
47 [[getNetworkStateText_(activeNetworkState, deviceState)]]
48 </div>
49 </div>
33 </div> 50 </div>
34 51
35 <template is="dom-if" if="[[showSimInfo_(deviceState)]]"> 52 <template is="dom-if" if="[[showSimInfo_(deviceState)]]">
36 <network-siminfo editable class="flex" 53 <network-siminfo editable
37 network-properties="[[getCellularState_(deviceState)]]" 54 network-properties="[[getCellularState_(deviceState)]]"
38 networking-private="[[networkingPrivate]]"> 55 networking-private="[[networkingPrivate]]">
39 </network-siminfo> 56 </network-siminfo>
40 </template> 57 </template>
41 58
59 <template is="dom-if" if="[[showPolicyIndicator_(activeNetworkState)]]">
60 <cr-policy-indicator indicator-type="[[getIndicatorTypeForSource(
61 activeNetworkState.Source)]]">
62 </cr-policy-indicator>
63 </template>
64
42 <template is="dom-if" if="[[showDetailsIsVisible_(deviceState)]]"> 65 <template is="dom-if" if="[[showDetailsIsVisible_(deviceState)]]">
43 <button class="subpage-arrow" is="paper-icon-button-light" 66 <button class="subpage-arrow" is="paper-icon-button-light"
44 aria-label$="[[getDetailsA11yString_(activeNetworkState, 67 aria-label$="[[getDetailsA11yString_(activeNetworkState,
45 deviceState, networkStateList)]]"> 68 deviceState, networkStateList)]]">
46 </button> 69 </button>
47 </template> 70 </template>
48 71
49 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> 72 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]">
50 <div class="secondary-action"> 73 <div class="secondary-action">
51 <paper-toggle-button id="deviceEnabledButton" 74 <paper-toggle-button id="deviceEnabledButton"
52 aria-label$="[[getToggleA11yString_(deviceState)]]" 75 aria-label$="[[getToggleA11yString_(deviceState)]]"
53 checked="[[deviceIsEnabled_(deviceState)]]" 76 checked="[[deviceIsEnabled_(deviceState)]]"
54 enabled="[[enableToggleIsEnabled_(deviceState)]]" 77 enabled="[[enableToggleIsEnabled_(deviceState)]]"
55 on-tap="onDeviceEnabledTap_"> 78 on-tap="onDeviceEnabledTap_">
56 </paper-toggle-button> 79 </paper-toggle-button>
57 </div> 80 </div>
58 </template> 81 </template>
59 </div> 82 </div>
60 </template> 83 </template>
61 <script src="network_summary_item.js"></script> 84 <script src="network_summary_item.js"></script>
62 </dom-module> 85 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698