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

Side by Side Diff: chrome/browser/resources/options2/chromeos/network_list.js

Issue 10006028: Plugins page in BWSI session has unnecessary and misleading UI components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit fix Created 8 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 cr.define('options.network', function() { 5 cr.define('options.network', function() {
6 6
7 var ArrayDataModel = cr.ui.ArrayDataModel; 7 var ArrayDataModel = cr.ui.ArrayDataModel;
8 var List = cr.ui.List; 8 var List = cr.ui.List;
9 var ListItem = cr.ui.ListItem; 9 var ListItem = cr.ui.ListItem;
10 var Menu = cr.ui.Menu; 10 var Menu = cr.ui.Menu;
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 Menu.decorate(menu); 411 Menu.decorate(menu);
412 var addendum = []; 412 var addendum = [];
413 if (this.data_.key == 'wifi') { 413 if (this.data_.key == 'wifi') {
414 addendum.push({label: localStrings.getString('joinOtherNetwork'), 414 addendum.push({label: localStrings.getString('joinOtherNetwork'),
415 command: 'connect', 415 command: 'connect',
416 data: {networkType: Constants.TYPE_WIFI, 416 data: {networkType: Constants.TYPE_WIFI,
417 servicePath: '?'}}); 417 servicePath: '?'}});
418 } else if (this.data_.key == 'cellular') { 418 } else if (this.data_.key == 'cellular') {
419 var label = enableDataRoaming_ ? 'disableDataRoaming' : 419 var label = enableDataRoaming_ ? 'disableDataRoaming' :
420 'enableDataRoaming'; 420 'enableDataRoaming';
421 var disabled = !AccountsOptions.currentUserIsOwner(); 421 var disabled = !UIAccountTweaks.currentUserIsOwner();
422 var entry = {label: localStrings.getString(label), 422 var entry = {label: localStrings.getString(label),
423 data: {}}; 423 data: {}};
424 if (disabled) { 424 if (disabled) {
425 entry.command = null; 425 entry.command = null;
426 entry.tooltip = 426 entry.tooltip =
427 localStrings.getString('dataRoamingDisableToggleTooltip'); 427 localStrings.getString('dataRoamingDisableToggleTooltip');
428 } else { 428 } else {
429 entry.command = function() { 429 entry.command = function() {
430 options.Preferences.setBooleanPref( 430 options.Preferences.setBooleanPref(
431 'cros.signed.data_roaming_enabled', 431 'cros.signed.data_roaming_enabled',
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 * Whether the Network list is disabled. Only used for display purpose. 992 * Whether the Network list is disabled. Only used for display purpose.
993 * @type {boolean} 993 * @type {boolean}
994 */ 994 */
995 cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR); 995 cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
996 996
997 // Export 997 // Export
998 return { 998 return {
999 NetworkList: NetworkList 999 NetworkList: NetworkList
1000 }; 1000 };
1001 }); 1001 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698