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

Side by Side Diff: chrome/browser/resources/settings/settings_ui/settings_ui.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 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-ui' implements the UI for the Settings page. 7 * 'settings-ui' implements the UI for the Settings page.
8 * 8 *
9 * Example: 9 * Example:
10 * 10 *
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // <if expr="chromeos"> 101 // <if expr="chromeos">
102 controlledSettingShared: 102 controlledSettingShared:
103 loadTimeData.getString('controlledSettingShared'), 103 loadTimeData.getString('controlledSettingShared'),
104 controlledSettingOwner: loadTimeData.getString('controlledSettingOwner'), 104 controlledSettingOwner: loadTimeData.getString('controlledSettingOwner'),
105 // </if> 105 // </if>
106 }; 106 };
107 107
108 // <if expr="chromeos"> 108 // <if expr="chromeos">
109 CrOncStrings = { 109 CrOncStrings = {
110 OncTypeCellular: loadTimeData.getString('OncTypeCellular'), 110 OncTypeCellular: loadTimeData.getString('OncTypeCellular'),
111 OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'),
111 OncTypeTether: loadTimeData.getString('OncTypeTether'), 112 OncTypeTether: loadTimeData.getString('OncTypeTether'),
112 OncTypeEthernet: loadTimeData.getString('OncTypeEthernet'),
113 OncTypeVPN: loadTimeData.getString('OncTypeVPN'), 113 OncTypeVPN: loadTimeData.getString('OncTypeVPN'),
114 OncTypeWiFi: loadTimeData.getString('OncTypeWiFi'), 114 OncTypeWiFi: loadTimeData.getString('OncTypeWiFi'),
115 OncTypeWiMAX: loadTimeData.getString('OncTypeWiMAX'), 115 OncTypeWiMAX: loadTimeData.getString('OncTypeWiMAX'),
116 networkListItemConnected: 116 networkListItemConnected:
117 loadTimeData.getString('networkListItemConnected'), 117 loadTimeData.getString('networkListItemConnected'),
118 networkListItemConnecting: 118 networkListItemConnecting:
119 loadTimeData.getString('networkListItemConnecting'), 119 loadTimeData.getString('networkListItemConnecting'),
120 networkListItemConnectingTo: 120 networkListItemConnectingTo:
121 loadTimeData.getString('networkListItemConnectingTo'), 121 loadTimeData.getString('networkListItemConnectingTo'),
122 networkListItemNotConnected: 122 networkListItemNotConnected:
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 this.$.container.removeAttribute('tabindex'); 286 this.$.container.removeAttribute('tabindex');
287 }.bind(this)); 287 }.bind(this));
288 }, 288 },
289 289
290 /** @private */ 290 /** @private */
291 directionDelegateChanged_: function() { 291 directionDelegateChanged_: function() {
292 this.$.drawer.align = this.directionDelegate.isRtl() ? 292 this.$.drawer.align = this.directionDelegate.isRtl() ?
293 'right' : 'left'; 293 'right' : 'left';
294 }, 294 },
295 }); 295 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698