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

Side by Side Diff: chrome/browser/resources/options/content_settings.js

Issue 1963203002: [Chrome Settings UI] Show overruled User Exceptions as strike-through. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync. Created 4 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 (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.exportPath('options'); 5 cr.exportPath('options');
6 6
7 /** 7 /**
8 * @typedef {{appId: string, 8 * @typedef {{appId: string,
9 * appName: (string|undefined), 9 * appName: (string|undefined),
10 * embeddingOrigin: (string|undefined), 10 * embeddingOrigin: (string|undefined),
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // Create a synthetic pref change event decorated as 120 // Create a synthetic pref change event decorated as
121 // CoreOptionsHandler::CreateValueForPref() does. 121 // CoreOptionsHandler::CreateValueForPref() does.
122 var event = new Event(group); 122 var event = new Event(group);
123 event.value = { 123 event.value = {
124 value: dict[group].value, 124 value: dict[group].value,
125 controlledBy: controlledBy, 125 controlledBy: controlledBy,
126 }; 126 };
127 for (var i = 0; i < indicators.length; i++) { 127 for (var i = 0; i < indicators.length; i++) {
128 indicators[i].handlePrefChange(event); 128 indicators[i].handlePrefChange(event);
129 } 129 }
130 if (controlledBy)
131 this.getExceptionsList(group, 'normal').setOverruledBy(controlledBy);
130 } 132 }
131 }; 133 };
132 134
133 /** 135 /**
134 * Initializes an exceptions list. 136 * Initializes an exceptions list.
135 * @param {string} type The content type that we are setting exceptions for. 137 * @param {string} type The content type that we are setting exceptions for.
136 * @param {Array<options.Exception>} exceptions An array of pairs, where the 138 * @param {Array<options.Exception>} exceptions An array of pairs, where the
137 * first element of each pair is the filter string, and the second is the 139 * first element of each pair is the filter string, and the second is the
138 * setting (allow/block). 140 * setting (allow/block).
139 */ 141 */
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 var deviceSelect = $('media-select-camera'); 290 var deviceSelect = $('media-select-camera');
289 chrome.send('setDefaultCaptureDevice', ['camera', deviceSelect.value]); 291 chrome.send('setDefaultCaptureDevice', ['camera', deviceSelect.value]);
290 }; 292 };
291 293
292 // Export 294 // Export
293 return { 295 return {
294 ContentSettings: ContentSettings 296 ContentSettings: ContentSettings
295 }; 297 };
296 298
297 }); 299 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698