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

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

Issue 1412523003: Adding <keygen> Content Setting (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using new Keygen icons. Created 4 years, 11 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),
11 * origin: string, 11 * origin: string,
12 * setting: string, 12 * setting: string,
13 * source: string, 13 * source: string,
14 * video: (string|undefined)}} 14 * video: (string|undefined)}}
15 */ 15 */
16 options.Exception; 16 options.Exception;
17 17
18 cr.define('options', function() { 18 cr.define('options', function() {
19 /** @const */ var Page = cr.ui.pageManager.Page; 19 /** @const */ var Page = cr.ui.pageManager.Page;
20 /** @const */ var PageManager = cr.ui.pageManager.PageManager; 20 /** @const */ var PageManager = cr.ui.pageManager.PageManager;
21 21
22 // Lookup table to generate the i18n strings. 22 // Lookup table to generate the i18n strings.
23 /** @const */ var permissionsLookup = { 23 /** @const */ var permissionsLookup = {
24 'cookies': 'cookies', 24 'cookies': 'cookies',
25 'images': 'images', 25 'images': 'images',
26 'javascript': 'javascript', 26 'javascript': 'javascript',
27 'keygen': 'keygen',
27 'location': 'location', 28 'location': 'location',
28 'media-stream-camera': 'mediaStreamCamera', 29 'media-stream-camera': 'mediaStreamCamera',
29 'media-stream-mic': 'mediaStreamMic', 30 'media-stream-mic': 'mediaStreamMic',
30 'multiple-automatic-downloads': 'multipleAutomaticDownloads', 31 'multiple-automatic-downloads': 'multipleAutomaticDownloads',
31 'notifications': 'notifications', 32 'notifications': 'notifications',
32 'plugins': 'plugins', 33 'plugins': 'plugins',
33 'popups': 'popups', 34 'popups': 'popups',
34 }; 35 };
35 36
36 ////////////////////////////////////////////////////////////////////////////// 37 //////////////////////////////////////////////////////////////////////////////
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 var deviceSelect = $('media-select-camera'); 298 var deviceSelect = $('media-select-camera');
298 chrome.send('setDefaultCaptureDevice', ['camera', deviceSelect.value]); 299 chrome.send('setDefaultCaptureDevice', ['camera', deviceSelect.value]);
299 }; 300 };
300 301
301 // Export 302 // Export
302 return { 303 return {
303 ContentSettings: ContentSettings 304 ContentSettings: ContentSettings
304 }; 305 };
305 306
306 }); 307 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698