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

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe_welcome.js

Issue 2913323003: Settings: Network: Merge Tether networks into Mobile subpage (Closed)
Patch Set: Feedback + additional tests Created 3 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 Polymer element for displaying material design OOBE. 6 * @fileoverview Polymer element for displaying material design OOBE.
7 */ 7 */
8 8
9 Polymer({ 9 Polymer({
10 is: 'oobe-welcome-md', 10 is: 'oobe-welcome-md',
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 this.updateLocalizedContent(); 104 this.updateLocalizedContent();
105 }, 105 },
106 106
107 /** 107 /**
108 * This is called when UI strings are changed. 108 * This is called when UI strings are changed.
109 */ 109 */
110 updateLocalizedContent: function() { 110 updateLocalizedContent: function() {
111 CrOncStrings = { 111 CrOncStrings = {
112 OncTypeCellular: loadTimeData.getString('OncTypeCellular'), 112 OncTypeCellular: loadTimeData.getString('OncTypeCellular'),
113 OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'), 113 OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'),
114 OncTypeTether: loadTimeData.getString('OncTypeTether'),
114 OncTypeVPN: loadTimeData.getString('OncTypeVPN'), 115 OncTypeVPN: loadTimeData.getString('OncTypeVPN'),
115 OncTypeWiFi: loadTimeData.getString('OncTypeWiFi'), 116 OncTypeWiFi: loadTimeData.getString('OncTypeWiFi'),
116 OncTypeWiMAX: loadTimeData.getString('OncTypeWiMAX'), 117 OncTypeWiMAX: loadTimeData.getString('OncTypeWiMAX'),
117 networkListItemConnected: 118 networkListItemConnected:
118 loadTimeData.getString('networkListItemConnected'), 119 loadTimeData.getString('networkListItemConnected'),
119 networkListItemConnecting: 120 networkListItemConnecting:
120 loadTimeData.getString('networkListItemConnecting'), 121 loadTimeData.getString('networkListItemConnecting'),
121 networkListItemConnectingTo: 122 networkListItemConnectingTo:
122 loadTimeData.getString('networkListItemConnectingTo'), 123 loadTimeData.getString('networkListItemConnectingTo'),
123 networkListItemNotConnected: 124 networkListItemNotConnected:
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 * @private 488 * @private
488 */ 489 */
489 onTimezoneSelected_: function(event) { 490 onTimezoneSelected_: function(event) {
490 var item = event.detail; 491 var item = event.detail;
491 if (!item) 492 if (!item)
492 return; 493 return;
493 494
494 this.screen.onTimezoneSelected_(item.value); 495 this.screen.onTimezoneSelected_(item.value);
495 }, 496 },
496 }); 497 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698