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

Side by Side Diff: chrome/browser/resources/settings/internet_page/internet_page.js

Issue 2720503006: MD Settings: Internet: Move network lists to a subpage (Closed)
Patch Set: Rebase 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview 6 * @fileoverview
7 * 'settings-internet-page' is the settings page containing internet 7 * 'settings-internet-page' is the settings page containing internet
8 * settings. 8 * settings.
9 */ 9 */
10 Polymer({ 10 Polymer({
11 is: 'settings-internet-page', 11 is: 'settings-internet-page',
12 12
13 behaviors: [I18nBehavior], 13 behaviors: [I18nBehavior, settings.RouteObserverBehavior],
14 14
15 properties: { 15 properties: {
16 /** 16 /**
17 * Interface for networkingPrivate calls. May be overriden by tests. 17 * Interface for networkingPrivate calls. May be overriden by tests.
18 * @type {NetworkingPrivate} 18 * @type {NetworkingPrivate}
19 */ 19 */
20 networkingPrivate: { 20 networkingPrivate: {
21 type: Object, 21 type: Object,
22 value: chrome.networkingPrivate, 22 value: chrome.networkingPrivate,
23 }, 23 },
(...skipping 17 matching lines...) Expand all
41 /** 41 /**
42 * Highest priority connected network or null. Set by network-summary. 42 * Highest priority connected network or null. Set by network-summary.
43 * @type {?CrOnc.NetworkStateProperties|undefined} 43 * @type {?CrOnc.NetworkStateProperties|undefined}
44 */ 44 */
45 defaultNetwork: { 45 defaultNetwork: {
46 type: Object, 46 type: Object,
47 notify: true, 47 notify: true,
48 }, 48 },
49 49
50 /** 50 /**
51 * Set by internet-subpage. Controls spinner visibility in subpage header.
52 * @private
53 */
54 showSpinner_: Boolean,
55
56 /**
57 * The network type for the networks subpage. Used in the subpage header.
58 * @private
59 */
60 subpageType_: String,
61
62 /**
51 * The network type for the known networks subpage. 63 * The network type for the known networks subpage.
52 * @private 64 * @private
53 */ 65 */
54 knownNetworksType_: String, 66 knownNetworksType_: String,
55 67
56 /** 68 /**
57 * Whether the 'Add connection' section is expanded. 69 * Whether the 'Add connection' section is expanded.
58 * @private 70 * @private
59 */ 71 */
60 addConnectionExpanded_: { 72 addConnectionExpanded_: {
(...skipping 15 matching lines...) Expand all
76 return []; 88 return [];
77 } 89 }
78 }, 90 },
79 }, 91 },
80 92
81 // Element event listeners 93 // Element event listeners
82 listeners: { 94 listeners: {
83 'device-enabled-toggled': 'onDeviceEnabledToggled_', 95 'device-enabled-toggled': 'onDeviceEnabledToggled_',
84 'show-detail': 'onShowDetail_', 96 'show-detail': 'onShowDetail_',
85 'show-known-networks': 'onShowKnownNetworks_', 97 'show-known-networks': 'onShowKnownNetworks_',
98 'show-networks': 'onShowNetworks_',
86 }, 99 },
87 100
88 // chrome.networkingPrivate listeners 101 // chrome.networkingPrivate listeners
89 /** @private {Function} */ 102 /** @private {Function} */
90 onExtensionAddedListener_: null, 103 onExtensionAddedListener_: null,
91 104
92 /** @private {Function} */ 105 /** @private {Function} */
93 onExtensionRemovedListener_: null, 106 onExtensionRemovedListener_: null,
94 107
95 /** @private {Function} */ 108 /** @private {Function} */
(...skipping 28 matching lines...) Expand all
124 assert(this.onExtensionAddedListener_)); 137 assert(this.onExtensionAddedListener_));
125 chrome.management.onEnabled.removeListener( 138 chrome.management.onEnabled.removeListener(
126 assert(this.onExtensionAddedListener_)); 139 assert(this.onExtensionAddedListener_));
127 chrome.management.onUninstalled.removeListener( 140 chrome.management.onUninstalled.removeListener(
128 assert(this.onExtensionRemovedListener_)); 141 assert(this.onExtensionRemovedListener_));
129 chrome.management.onDisabled.removeListener( 142 chrome.management.onDisabled.removeListener(
130 assert(this.onExtensionDisabledListener_)); 143 assert(this.onExtensionDisabledListener_));
131 }, 144 },
132 145
133 /** 146 /**
147 * settings.RouteObserverBehavior
148 * @param {!settings.Route} route
149 * @protected
150 */
151 currentRouteChanged: function(route) {
152 if (route == settings.Route.INTERNET_NETWORKS) {
153 // Handle direct navigation to the networks page,
154 // e.g. chrome://settings/internet/networks?type=WiFi
155 var queryParams = settings.getQueryParameters();
156 var type = queryParams.get('type');
157 if (type)
158 this.subpageType_ = type;
159 }
160 },
161
162 /**
134 * Event triggered by a device state enabled toggle. 163 * Event triggered by a device state enabled toggle.
135 * @param {!{detail: {enabled: boolean, 164 * @param {!{detail: {enabled: boolean,
136 * type: chrome.networkingPrivate.NetworkType}}} event 165 * type: chrome.networkingPrivate.NetworkType}}} event
137 * @private 166 * @private
138 */ 167 */
139 onDeviceEnabledToggled_: function(event) { 168 onDeviceEnabledToggled_: function(event) {
140 if (event.detail.enabled) 169 if (event.detail.enabled)
141 this.networkingPrivate.enableNetworkType(event.detail.type); 170 this.networkingPrivate.enableNetworkType(event.detail.type);
142 else 171 else
143 this.networkingPrivate.disableNetworkType(event.detail.type); 172 this.networkingPrivate.disableNetworkType(event.detail.type);
144 }, 173 },
145 174
146 /** 175 /**
147 * @param {!{detail: !CrOnc.NetworkStateProperties}} event 176 * @param {!{detail: !CrOnc.NetworkStateProperties}} event
148 * @private 177 * @private
149 */ 178 */
150 onShowDetail_: function(event) { 179 onShowDetail_: function(event) {
151 var params = new URLSearchParams; 180 var params = new URLSearchParams;
152 params.append('guid', event.detail.GUID); 181 params.append('guid', event.detail.GUID);
153 params.append('type', event.detail.Type); 182 params.append('type', event.detail.Type);
154 if (event.detail.Name) 183 if (event.detail.Name)
155 params.append('name', event.detail.Name); 184 params.append('name', event.detail.Name);
156 settings.navigateTo(settings.Route.NETWORK_DETAIL, params); 185 settings.navigateTo(settings.Route.NETWORK_DETAIL, params);
157 }, 186 },
158 187
159 /** 188 /**
160 * @param {!{detail: {type: string}}} event 189 * @param {!{detail: {type: string}}} event
161 * @private 190 * @private
162 */ 191 */
192 onShowNetworks_: function(event) {
193 var params = new URLSearchParams;
194 params.append('type', event.detail.Type);
195 this.subpageType_ = event.detail.Type;
196 settings.navigateTo(settings.Route.INTERNET_NETWORKS, params);
197 },
198
199 /**
200 * @return {string}
201 * @private
202 */
203 getNetworksPageTitle_: function() {
204 return this.i18n('OncType' + this.subpageType_);
205 },
206
207 /**
208 * @param {!{detail: {type: string}}} event
209 * @private
210 */
163 onShowKnownNetworks_: function(event) { 211 onShowKnownNetworks_: function(event) {
164 this.knownNetworksType_ = event.detail.type; 212 this.knownNetworksType_ = event.detail.type;
165 settings.navigateTo(settings.Route.KNOWN_NETWORKS); 213 settings.navigateTo(settings.Route.KNOWN_NETWORKS);
166 }, 214 },
167 215
168 /** 216 /**
169 * Event triggered when the 'Add connections' div is tapped. 217 * Event triggered when the 'Add connections' div is tapped.
170 * @param {Event} event 218 * @param {Event} event
171 * @private 219 * @private
172 */ 220 */
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 }, 323 },
276 324
277 /** 325 /**
278 * @param {!chrome.networkingPrivate.ThirdPartyVPNProperties} provider 326 * @param {!chrome.networkingPrivate.ThirdPartyVPNProperties} provider
279 * @return {string} 327 * @return {string}
280 */ 328 */
281 getAddThirdParrtyVpnLabel_: function(provider) { 329 getAddThirdParrtyVpnLabel_: function(provider) {
282 return this.i18n('internetAddThirdPartyVPN', provider.ProviderName); 330 return this.i18n('internetAddThirdPartyVPN', provider.ProviderName);
283 } 331 }
284 }); 332 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698