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

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: Fix browser_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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 this.updateLocalizedContent(); 106 this.updateLocalizedContent();
107 }, 107 },
108 108
109 /** 109 /**
110 * This is called when UI strings are changed. 110 * This is called when UI strings are changed.
111 */ 111 */
112 updateLocalizedContent: function() { 112 updateLocalizedContent: function() {
113 CrOncStrings = { 113 CrOncStrings = {
114 OncTypeCellular: loadTimeData.getString('OncTypeCellular'), 114 OncTypeCellular: loadTimeData.getString('OncTypeCellular'),
115 OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'), 115 OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'),
116 OncTypeTether: loadTimeData.getString('OncTypeTether'),
116 OncTypeVPN: loadTimeData.getString('OncTypeVPN'), 117 OncTypeVPN: loadTimeData.getString('OncTypeVPN'),
117 OncTypeWiFi: loadTimeData.getString('OncTypeWiFi'), 118 OncTypeWiFi: loadTimeData.getString('OncTypeWiFi'),
118 OncTypeWiMAX: loadTimeData.getString('OncTypeWiMAX'), 119 OncTypeWiMAX: loadTimeData.getString('OncTypeWiMAX'),
119 networkListItemConnected: 120 networkListItemConnected:
120 loadTimeData.getString('networkListItemConnected'), 121 loadTimeData.getString('networkListItemConnected'),
121 networkListItemConnecting: 122 networkListItemConnecting:
122 loadTimeData.getString('networkListItemConnecting'), 123 loadTimeData.getString('networkListItemConnecting'),
123 networkListItemConnectingTo: 124 networkListItemConnectingTo:
124 loadTimeData.getString('networkListItemConnectingTo'), 125 loadTimeData.getString('networkListItemConnectingTo'),
125 networkListItemNotConnected: 126 networkListItemNotConnected:
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 * @private 498 * @private
498 */ 499 */
499 onTimezoneSelected_: function(event) { 500 onTimezoneSelected_: function(event) {
500 var item = event.detail; 501 var item = event.detail;
501 if (!item) 502 if (!item)
502 return; 503 return;
503 504
504 this.screen.onTimezoneSelected_(item.value); 505 this.screen.onTimezoneSelected_(item.value);
505 }, 506 },
506 }); 507 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698