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

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: Address 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 11 matching lines...) Expand all
34 .vpn-header { 34 .vpn-header {
35 -webkit-margin-end: 12px; 35 -webkit-margin-end: 12px;
36 -webkit-margin-start: 4px; 36 -webkit-margin-start: 4px;
37 margin-bottom: 8px; 37 margin-bottom: 8px;
38 margin-top: 8px; 38 margin-top: 8px;
39 } 39 }
40 40
41 .no-networks { 41 .no-networks {
42 margin: 4px; 42 margin: 4px;
43 } 43 }
44
45 cr-network-list {
46 flex: 1;
47 }
44 </style> 48 </style>
45 49
46 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]"> 50 <template is="dom-if" if="[[enableToggleIsVisible_(deviceState)]]">
47 <div class="settings-box first"> 51 <div class="settings-box first">
48 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]"> 52 <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]">
49 [[getOffOnString_(deviceState, 53 [[getOffOnString_(deviceState,
50 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]] 54 '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]]
51 </div> 55 </div>
52 <!-- The add button in this row is only shown for WiFi networks. --> 56 <!-- The add button in this row is only shown for WiFi networks. -->
53 <paper-icon-button id="addButton" icon="settings:add-wifi" 57 <paper-icon-button id="addButton" icon="settings:add-wifi"
(...skipping 25 matching lines...) Expand all
79 <div class="vpn-header layout horizontal center" 83 <div class="vpn-header layout horizontal center"
80 hidden$="[[!isEqual_('VPN', deviceState.Type)]]"> 84 hidden$="[[!isEqual_('VPN', deviceState.Type)]]">
81 <div class="flex">$i18n{networkVpnBuiltin}</div> 85 <div class="flex">$i18n{networkVpnBuiltin}</div>
82 <paper-icon-button icon="settings:add-circle" 86 <paper-icon-button icon="settings:add-circle"
83 aria-label="$i18n{internetAddVPN}" 87 aria-label="$i18n{internetAddVPN}"
84 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]"> 88 on-tap="onAddButtonTap_" tabindex$="[[tabindex]]">
85 </paper-icon-button> 89 </paper-icon-button>
86 </div> 90 </div>
87 91
88 <!-- List of networks or 'None'. --> 92 <!-- List of networks or 'None'. -->
89 <cr-network-list id="networkList" class="flex" show-buttons 93 <cr-network-list id="networkList" show-buttons
90 hidden$="[[!networkStateList_.length]]" 94 hidden$="[[!networkStateList_.length]]"
91 networks="[[networkStateList_]]" 95 networks="[[networkStateList_]]"
92 on-selected="onNetworkSelected_"> 96 on-selected="onNetworkSelected_">
93 </cr-network-list> 97 </cr-network-list>
94 <div hidden$="[[networkStateList_.length]]" class="no-networks"> 98 <div hidden$="[[networkStateList_.length]]" class="no-networks">
95 $i18n{internetNoNetworks} 99 $i18n{internetNoNetworks}
96 </div> 100 </div>
97 101
98 <!-- Third party VPNs. --> 102 <!-- Third party VPNs. -->
99 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]"> 103 <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]">
100 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]"> 104 <template is="dom-repeat" items="[[thirdPartyVpnProviders]]">
101 <div id="[[item.ProviderName]]" 105 <div id="[[item.ProviderName]]"
102 class="vpn-header layout horizontal center"> 106 class="vpn-header layout horizontal center">
103 <div class="flex">[[item.ProviderName]]</div> 107 <div class="flex">[[item.ProviderName]]</div>
104 <paper-icon-button icon="settings:add-circle" 108 <paper-icon-button icon="settings:add-circle"
105 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]" 109 aria-label$="[[getAddThirdPartyVpnA11yString_(item)]]"
106 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]"> 110 on-tap="onAddThirdPartyVpnTap_" tabindex$="[[tabindex]]">
107 </paper-icon-button> 111 </paper-icon-button>
108 </div> 112 </div>
109 <cr-network-list class="flex" show-buttons 113 <cr-network-list show-buttons
110 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" 114 hidden$="[[!haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]"
111 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]" 115 networks="[[getThirdPartyVpnNetworks_(thirdPartyVpns_, item)]]"
112 on-selected="onNetworkSelected_"> 116 on-selected="onNetworkSelected_">
113 </cr-network-list> 117 </cr-network-list>
114 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]" 118 <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]"
115 class="no-networks"> 119 class="no-networks">
116 $i18n{internetNoNetworks} 120 $i18n{internetNoNetworks}
117 </div> 121 </div>
118 </template> 122 </template>
119 </template> 123 </template>
120 </div> 124 </div>
121 125
122 </template> 126 </template>
123 127
124 </template> 128 </template>
125 <script src="internet_subpage.js"></script> 129 <script src="internet_subpage.js"></script>
126 </dom-module> 130 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698