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

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

Issue 2004353002: Delete unused code for exclusive access permission prompting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fullscreen-mac-remove-window-controller
Patch Set: Remove unused element ids. 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 * @param {boolean} show Whether to show (or hide) the link. 197 * @param {boolean} show Whether to show (or hide) the link.
198 */ 198 */
199 ContentSettings.showMediaPepperFlashLink = 199 ContentSettings.showMediaPepperFlashLink =
200 function(linkType, contentType, show) { 200 function(linkType, contentType, show) {
201 assert(['default', 'exceptions'].indexOf(linkType) >= 0); 201 assert(['default', 'exceptions'].indexOf(linkType) >= 0);
202 assert(['mic', 'camera'].indexOf(contentType) >= 0); 202 assert(['mic', 'camera'].indexOf(contentType) >= 0);
203 $('media-pepper-flash-' + linkType + '-' + contentType).hidden = !show; 203 $('media-pepper-flash-' + linkType + '-' + contentType).hidden = !show;
204 }; 204 };
205 205
206 /** 206 /**
207 * Shows/hides parts of the fullscreen and mouselock sections.
208 * @param {boolean} deprecationVisible Whether to show (or hide) the
209 * deprecation warning labels.
210 * @param {boolean} globalsVisible Whether to show (or hide) global settings.
211 */
212 ContentSettings.setExclusiveAccessVisible = function(
213 deprecationVisible, globalsVisible) {
214 $('fullscreen-deprecated').hidden = !deprecationVisible;
215 $('mouselock-deprecated').hidden = !deprecationVisible;
216 $('mouselock-global-settings').hidden = !globalsVisible;
217 };
218
219 /**
220 * Updates the microphone/camera devices menu with the given entries. 207 * Updates the microphone/camera devices menu with the given entries.
221 * @param {string} type The device type. 208 * @param {string} type The device type.
222 * @param {Array} devices List of available devices. 209 * @param {Array} devices List of available devices.
223 * @param {string} defaultdevice The unique id of the current default device. 210 * @param {string} defaultdevice The unique id of the current default device.
224 */ 211 */
225 ContentSettings.updateDevicesMenu = function(type, devices, defaultdevice) { 212 ContentSettings.updateDevicesMenu = function(type, devices, defaultdevice) {
226 var deviceSelect = ''; 213 var deviceSelect = '';
227 if (type == 'mic') { 214 if (type == 'mic') {
228 deviceSelect = $('media-select-mic'); 215 deviceSelect = $('media-select-mic');
229 } else if (type == 'camera') { 216 } else if (type == 'camera') {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 var deviceSelect = $('media-select-camera'); 275 var deviceSelect = $('media-select-camera');
289 chrome.send('setDefaultCaptureDevice', ['camera', deviceSelect.value]); 276 chrome.send('setDefaultCaptureDevice', ['camera', deviceSelect.value]);
290 }; 277 };
291 278
292 // Export 279 // Export
293 return { 280 return {
294 ContentSettings: ContentSettings 281 ContentSettings: ContentSettings
295 }; 282 };
296 283
297 }); 284 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698