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

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

Issue 9816018: Update icons for network settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk. Created 8 years, 9 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
« no previous file with comments | « chrome/browser/resources/options2/browser_options.css ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 networkList.deleteItem('cellular'); 879 networkList.deleteItem('cellular');
880 } 880 }
881 881
882 // Only show VPN control if there is an available network and an internet 882 // Only show VPN control if there is an available network and an internet
883 // connection. 883 // connection.
884 if (data.vpnList.length > 0 && (ethernetConnection || 884 if (data.vpnList.length > 0 && (ethernetConnection ||
885 isConnected_(data.wirelessList))) 885 isConnected_(data.wirelessList)))
886 loadData_('vpn', data.vpnList, data.rememberedList); 886 loadData_('vpn', data.vpnList, data.rememberedList);
887 else 887 else
888 networkList.deleteItem('vpn'); 888 networkList.deleteItem('vpn');
889
890 networkList.updateToggleControl('airplaneMode', data.airplaneMode); 889 networkList.updateToggleControl('airplaneMode', data.airplaneMode);
891 890
892 networkList.invalidate(); 891 networkList.invalidate();
893 networkList.redraw(); 892 networkList.redraw();
894 }; 893 };
895 894
896 /** 895 /**
897 * Element for indicating a policy managed network. 896 * Element for indicating a policy managed network.
898 * @constructor 897 * @constructor
899 */ 898 */
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 * Whether the Network list is disabled. Only used for display purpose. 1007 * Whether the Network list is disabled. Only used for display purpose.
1009 * @type {boolean} 1008 * @type {boolean}
1010 */ 1009 */
1011 cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR); 1010 cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
1012 1011
1013 // Export 1012 // Export
1014 return { 1013 return {
1015 NetworkList: NetworkList 1014 NetworkList: NetworkList
1016 }; 1015 };
1017 }); 1016 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/browser_options.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698