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

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

Issue 2848443002: MD Settings: Remove usage of deprecated iron-flex-layout.html, for CrOS. (Closed)
Patch Set: Fix more Created 3 years, 7 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_list. html">
2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 5 <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-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_shared_css.html"> 8 <link rel="import" href="../settings_shared_css.html">
9 9
10 <dom-module id="settings-internet-subpage"> 10 <dom-module id="settings-internet-subpage">
11 <template> 11 <template>
12 <style include="settings-shared"> 12 <style include="settings-shared iron-flex">
13 #networkListDiv { 13 #networkListDiv {
14 /* cr-network-list is padded to the right to allow space for a ripple */ 14 /* cr-network-list is padded to the right to allow space for a ripple */
15 -webkit-padding-end: calc(var(--settings-box-row-padding) - 15 -webkit-padding-end: calc(var(--settings-box-row-padding) -
16 var(--cr-icon-ripple-padding)); 16 var(--cr-icon-ripple-padding));
17 -webkit-padding-start: var(--settings-box-row-padding); 17 -webkit-padding-start: var(--settings-box-row-padding);
18 margin-top: var(--settings-page-vertical-margin); 18 margin-top: var(--settings-page-vertical-margin);
19 min-height: var(--settings-box-min-height); 19 min-height: var(--settings-box-min-height);
20 } 20 }
21 21
22 #addButton { 22 #addButton {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 <div class="vpn-header layout horizontal center" 76 <div class="vpn-header layout horizontal center"
77 hidden$="[[!isEqual_('VPN', deviceState.Type)]]"> 77 hidden$="[[!isEqual_('VPN', deviceState.Type)]]">
78 <div class="flex">$i18n{networkVpnBuiltin}</div> 78 <div class="flex">$i18n{networkVpnBuiltin}</div>
79 <paper-icon-button icon="settings:add-circle" 79 <paper-icon-button icon="settings:add-circle"
80 aria-label="$i18n{internetAddVPN}" 80 aria-label="$i18n{internetAddVPN}"
81 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> 81 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]">
82 </paper-icon-button> 82 </paper-icon-button>
83 </div> 83 </div>
84 84
85 <!-- List of networks or 'None'. --> 85 <!-- List of networks or 'None'. -->
86 <cr-network-list id="networkList" class="flex" show-buttons 86 <cr-network-list id="networkList" show-buttons
stevenjb 2017/05/01 19:07:31 Ah, this was my problem. I'd actually be more comf
dpapad 2017/05/01 19:10:40 FYI https://github.com/PolymerElements/iron-flex-l
dpapad 2017/05/01 19:38:43 Done. Added flex:1 as requested.
87 hidden$="[[!networkStateList_.length]]" 87 hidden$="[[!networkStateList_.length]]"
88 networks="[[networkStateList_]]" 88 networks="[[networkStateList_]]"
89 on-selected="onNetworkSelected_"> 89 on-selected="onNetworkSelected_">
90 </cr-network-list> 90 </cr-network-list>
91 <div hidden$="[[networkStateList_.length]]" class="no-networks"> 91 <div hidden$="[[networkStateList_.length]]" class="no-networks">
92 $i18n{internetNoNetworks} 92 $i18n{internetNoNetworks}
93 </div> 93 </div>
94 94
95 <!-- Third party VPNs. --> 95 <!-- Third party VPNs. -->
96 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]"> 96 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]">
97 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]"> 97 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]">
98 <div id="[[item.ProviderName]]" 98 <div id="[[item.ProviderName]]"
99 class="vpn-header layout horizontal center"> 99 class="vpn-header layout horizontal center">
100 <div class="flex">[[item.ProviderName]]</div> 100 <div class="flex">[[item.ProviderName]]</div>
101 <paper-icon-button icon="settings:add-circle" 101 <paper-icon-button icon="settings:add-circle"
102 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]" 102 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]"
103 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]"> 103 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]">
104 </paper-icon-button> 104 </paper-icon-button>
105 </div> 105 </div>
106 <cr-network-list class="flex" show-buttons 106 <cr-network-list class="flex" show-buttons
stevenjb 2017/05/01 19:07:31 I think we need to fix this one also.
dpapad 2017/05/01 19:38:43 Done.
107 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" 107 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]"
108 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]" 108 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]"
109 on-selected="onNetworkSelected_"> 109 on-selected="onNetworkSelected_">
110 </cr-network-list> 110 </cr-network-list>
111 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" 111 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]"
112 class="no-networks"> 112 class="no-networks">
113 $i18n{internetNoNetworks} 113 $i18n{internetNoNetworks}
114 </div> 114 </div>
115 </template> 115 </template>
116 </template> 116 </template>
117 </div> 117 </div>
118 118
119 </template> 119 </template>
120 120
121 </template> 121 </template>
122 <script src="internet_subpage.js"></script> 122 <script src="internet_subpage.js"></script>
123 </dom-module> 123 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698