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

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

Issue 2957153003: MD Settings: remove unsupported routes from guest-mode. (Closed)
Patch Set: merge Created 3 years, 5 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({
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 assert(this.onExtensionDisabledListener_)); 156 assert(this.onExtensionDisabledListener_));
157 }, 157 },
158 158
159 /** 159 /**
160 * settings.RouteObserverBehavior 160 * settings.RouteObserverBehavior
161 * @param {!settings.Route} route 161 * @param {!settings.Route} route
162 * @param {!settings.Route} oldRoute 162 * @param {!settings.Route} oldRoute
163 * @protected 163 * @protected
164 */ 164 */
165 currentRouteChanged: function(route, oldRoute) { 165 currentRouteChanged: function(route, oldRoute) {
166 if (route == settings.Route.INTERNET_NETWORKS) { 166 if (route == settings.routes.INTERNET_NETWORKS) {
167 // Handle direct navigation to the networks page, 167 // Handle direct navigation to the networks page,
168 // e.g. chrome://settings/internet/networks?type=WiFi 168 // e.g. chrome://settings/internet/networks?type=WiFi
169 var queryParams = settings.getQueryParameters(); 169 var queryParams = settings.getQueryParameters();
170 var type = queryParams.get('type'); 170 var type = queryParams.get('type');
171 if (type) 171 if (type)
172 this.subpageType_ = type; 172 this.subpageType_ = type;
173 } else if (route == settings.Route.KNOWN_NETWORKS) { 173 } else if (route == settings.routes.KNOWN_NETWORKS) {
174 // Handle direct navigation to the known networks page, 174 // Handle direct navigation to the known networks page,
175 // e.g. chrome://settings/internet/knownNetworks?type=WiFi 175 // e.g. chrome://settings/internet/knownNetworks?type=WiFi
176 var queryParams = settings.getQueryParameters(); 176 var queryParams = settings.getQueryParameters();
177 var type = queryParams.get('type'); 177 var type = queryParams.get('type');
178 if (type) 178 if (type)
179 this.knownNetworksType_ = type; 179 this.knownNetworksType_ = type;
180 } else if ( 180 } else if (
181 route != settings.Route.INTERNET && route != settings.Route.BASIC) { 181 route != settings.routes.INTERNET && route != settings.routes.BASIC) {
182 // If we are navigating to a non internet section, do not set focus. 182 // If we are navigating to a non internet section, do not set focus.
183 return; 183 return;
184 } 184 }
185 185
186 if (!settings.Route.INTERNET.contains(oldRoute)) 186 if (!settings.routes.INTERNET ||
187 !settings.routes.INTERNET.contains(oldRoute))
187 return; 188 return;
188 189
189 // Focus the subpage arrow where appropriate. 190 // Focus the subpage arrow where appropriate.
190 var selector; 191 var selector;
191 if (route == settings.Route.INTERNET_NETWORKS) { 192 if (route == settings.routes.INTERNET_NETWORKS) {
192 // iron-list makes the correct timing to focus an item in the list 193 // iron-list makes the correct timing to focus an item in the list
193 // very complicated, and the item may not exist, so just focus the 194 // very complicated, and the item may not exist, so just focus the
194 // entire list for now. 195 // entire list for now.
195 selector = '* /deep/ #networkList'; 196 selector = '* /deep/ #networkList';
196 } else if (this.detailType_) { 197 } else if (this.detailType_) {
197 selector = '* /deep/ #' + this.detailType_ + ' /deep/ .subpage-arrow'; 198 selector = '* /deep/ #' + this.detailType_ + ' /deep/ .subpage-arrow';
198 } 199 }
199 if (selector && this.querySelector(selector)) 200 if (selector && this.querySelector(selector))
200 this.focusConfig_.set(oldRoute.path, selector); 201 this.focusConfig_.set(oldRoute.path, selector);
201 else 202 else
(...skipping 29 matching lines...) Expand all
231 * @param {string=} name 232 * @param {string=} name
232 * @private 233 * @private
233 */ 234 */
234 showConfig_: function(type, guid, name) { 235 showConfig_: function(type, guid, name) {
235 var params = new URLSearchParams; 236 var params = new URLSearchParams;
236 params.append('type', type); 237 params.append('type', type);
237 if (guid) 238 if (guid)
238 params.append('guid', guid); 239 params.append('guid', guid);
239 if (name) 240 if (name)
240 params.append('name', name); 241 params.append('name', name);
241 settings.navigateTo(settings.Route.NETWORK_CONFIG, params); 242 settings.navigateTo(settings.routes.NETWORK_CONFIG, params);
242 }, 243 },
243 244
244 /** 245 /**
245 * @param {!{detail: !CrOnc.NetworkStateProperties}} event 246 * @param {!{detail: !CrOnc.NetworkStateProperties}} event
246 * @private 247 * @private
247 */ 248 */
248 onShowDetail_: function(event) { 249 onShowDetail_: function(event) {
249 this.detailType_ = event.detail.Type; 250 this.detailType_ = event.detail.Type;
250 var params = new URLSearchParams; 251 var params = new URLSearchParams;
251 params.append('guid', event.detail.GUID); 252 params.append('guid', event.detail.GUID);
252 params.append('type', event.detail.Type); 253 params.append('type', event.detail.Type);
253 if (event.detail.Name) 254 if (event.detail.Name)
254 params.append('name', event.detail.Name); 255 params.append('name', event.detail.Name);
255 settings.navigateTo(settings.Route.NETWORK_DETAIL, params); 256 settings.navigateTo(settings.routes.NETWORK_DETAIL, params);
256 }, 257 },
257 258
258 /** 259 /**
259 * @param {!{detail: {type: string}}} event 260 * @param {!{detail: {type: string}}} event
260 * @private 261 * @private
261 */ 262 */
262 onShowNetworks_: function(event) { 263 onShowNetworks_: function(event) {
263 this.detailType_ = event.detail.Type; 264 this.detailType_ = event.detail.Type;
264 var params = new URLSearchParams; 265 var params = new URLSearchParams;
265 params.append('type', event.detail.Type); 266 params.append('type', event.detail.Type);
266 this.subpageType_ = event.detail.Type; 267 this.subpageType_ = event.detail.Type;
267 settings.navigateTo(settings.Route.INTERNET_NETWORKS, params); 268 settings.navigateTo(settings.routes.INTERNET_NETWORKS, params);
268 }, 269 },
269 270
270 /** 271 /**
271 * @return {string} 272 * @return {string}
272 * @private 273 * @private
273 */ 274 */
274 getNetworksPageTitle_: function() { 275 getNetworksPageTitle_: function() {
275 return this.i18n('OncType' + this.subpageType_); 276 return this.i18n('OncType' + this.subpageType_);
276 }, 277 },
277 278
(...skipping 15 matching lines...) Expand all
293 294
294 /** 295 /**
295 * @param {!{detail: {type: string}}} event 296 * @param {!{detail: {type: string}}} event
296 * @private 297 * @private
297 */ 298 */
298 onShowKnownNetworks_: function(event) { 299 onShowKnownNetworks_: function(event) {
299 this.detailType_ = event.detail.Type; 300 this.detailType_ = event.detail.Type;
300 var params = new URLSearchParams; 301 var params = new URLSearchParams;
301 params.append('type', event.detail.Type); 302 params.append('type', event.detail.Type);
302 this.knownNetworksType_ = event.detail.type; 303 this.knownNetworksType_ = event.detail.type;
303 settings.navigateTo(settings.Route.KNOWN_NETWORKS, params); 304 settings.navigateTo(settings.routes.KNOWN_NETWORKS, params);
304 }, 305 },
305 306
306 /** 307 /**
307 * Event triggered when the 'Add connections' div is tapped. 308 * Event triggered when the 'Add connections' div is tapped.
308 * @param {!Event} event 309 * @param {!Event} event
309 * @private 310 * @private
310 */ 311 */
311 onExpandAddConnectionsTap_: function(event) { 312 onExpandAddConnectionsTap_: function(event) {
312 if (event.target.id == 'expandAddConnections') 313 if (event.target.id == 'expandAddConnections')
313 return; 314 return;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 onNetworkConnect_: function(event) { 445 onNetworkConnect_: function(event) {
445 var properties = event.detail.networkProperties; 446 var properties = event.detail.networkProperties;
446 if (!event.detail.bypassConnectionDialog && 447 if (!event.detail.bypassConnectionDialog &&
447 CrOnc.shouldShowTetherDialogBeforeConnection(properties)) { 448 CrOnc.shouldShowTetherDialogBeforeConnection(properties)) {
448 var params = new URLSearchParams; 449 var params = new URLSearchParams;
449 params.append('guid', properties.GUID); 450 params.append('guid', properties.GUID);
450 params.append('type', properties.Type); 451 params.append('type', properties.Type);
451 params.append('name', CrOnc.getNetworkName(properties)); 452 params.append('name', CrOnc.getNetworkName(properties));
452 params.append('showConfigure', true.toString()); 453 params.append('showConfigure', true.toString());
453 454
454 settings.navigateTo(settings.Route.NETWORK_DETAIL, params); 455 settings.navigateTo(settings.routes.NETWORK_DETAIL, params);
455 return; 456 return;
456 } 457 }
457 458
458 this.networkingPrivate.startConnect(properties.GUID, function() { 459 this.networkingPrivate.startConnect(properties.GUID, function() {
459 if (chrome.runtime.lastError) { 460 if (chrome.runtime.lastError) {
460 var message = chrome.runtime.lastError.message; 461 var message = chrome.runtime.lastError.message;
461 if (message == 'connecting' || message == 'connect-canceled' || 462 if (message == 'connecting' || message == 'connect-canceled' ||
462 message == 'connected' || message == 'Error.InvalidNetworkGuid') { 463 message == 'connected' || message == 'Error.InvalidNetworkGuid') {
463 return; 464 return;
464 } 465 }
465 console.error( 466 console.error(
466 'Unexpected networkingPrivate.startConnect error: ' + message + 467 'Unexpected networkingPrivate.startConnect error: ' + message +
467 ' For: ' + properties.GUID); 468 ' For: ' + properties.GUID);
468 } 469 }
469 }); 470 });
470 }, 471 },
471 }); 472 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698