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

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

Issue 11078023: Add controlled setting indicators for content settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mark which of the policies considered can be recommended. Created 8 years, 2 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 ListSingleSelectionModel = cr.ui.ListSingleSelectionModel; 10 var ListSingleSelectionModel = cr.ui.ListSingleSelectionModel;
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 1025
1026 ManagedNetworkIndicator.prototype = { 1026 ManagedNetworkIndicator.prototype = {
1027 __proto__: ControlledSettingIndicator.prototype, 1027 __proto__: ControlledSettingIndicator.prototype,
1028 1028
1029 /** @inheritDoc */ 1029 /** @inheritDoc */
1030 decorate: function() { 1030 decorate: function() {
1031 ControlledSettingIndicator.prototype.decorate.call(this); 1031 ControlledSettingIndicator.prototype.decorate.call(this);
1032 this.controlledBy = 'policy'; 1032 this.controlledBy = 'policy';
1033 var policyLabel = loadTimeData.getString('managedNetwork'); 1033 var policyLabel = loadTimeData.getString('managedNetwork');
1034 this.setAttribute('textPolicy', policyLabel); 1034 this.setAttribute('textPolicy', policyLabel);
1035 this.className = 'controlled-setting-indicator';
Joao da Silva 2012/10/15 08:02:32 Why is this on this CL?
bartfab (slow) 2012/10/15 12:34:07 Because the parent class now explicitly sets the c
1036 this.removeAttribute('tabindex'); 1035 this.removeAttribute('tabindex');
1037 }, 1036 },
1038 1037
1039 /** @inheritDoc */ 1038 /** @inheritDoc */
1040 handleEvent: function(event) { 1039 handleEvent: function(event) {
1041 // Prevent focus blurring as that would close any currently open menu. 1040 // Prevent focus blurring as that would close any currently open menu.
1042 if (event.type == 'mousedown') 1041 if (event.type == 'mousedown')
1043 return; 1042 return;
1044 ControlledSettingIndicator.prototype.handleEvent.call(this, event); 1043 ControlledSettingIndicator.prototype.handleEvent.call(this, event);
1045 }, 1044 },
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 * Whether the Network list is disabled. Only used for display purpose. 1163 * Whether the Network list is disabled. Only used for display purpose.
1165 * @type {boolean} 1164 * @type {boolean}
1166 */ 1165 */
1167 cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR); 1166 cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
1168 1167
1169 // Export 1168 // Export
1170 return { 1169 return {
1171 NetworkList: NetworkList 1170 NetworkList: NetworkList
1172 }; 1171 };
1173 }); 1172 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698