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

Side by Side Diff: components/content_settings/core/common/content_settings_types.h

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing test_runner. Created 5 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ 5 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
6 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ 6 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 // A particular type of content to care about. We give the user various types 10 // A particular type of content to care about. We give the user various types
11 // of controls over each of these. 11 // of controls over each of these.
12 // When adding/removing values from this enum, be sure to update 12 // When adding/removing values from this enum, be sure to update
13 // ContentSettingsTypeHistogram and ContentSettingTypeToHistogramValue in 13 // ContentSettingsTypeHistogram and ContentSettingTypeToHistogramValue in
14 // content_settings.cc as well. 14 // content_settings.cc as well.
15 // A Java counterpart will be generated for this enum. 15 // A Java counterpart will be generated for this enum.
16 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser 16 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
17 enum ContentSettingsType { 17 enum ContentSettingsType {
18 // "DEFAULT" is only used as an argument to the Content Settings Window 18 // "DEFAULT" is only used as an argument to the Content Settings Window
19 // opener; there it means "whatever was last shown". 19 // opener; there it means "whatever was last shown".
20 CONTENT_SETTINGS_TYPE_DEFAULT = -1, 20 CONTENT_SETTINGS_TYPE_DEFAULT = -1,
21 CONTENT_SETTINGS_TYPE_COOKIES = 0, 21 CONTENT_SETTINGS_TYPE_COOKIES = 0,
22 CONTENT_SETTINGS_TYPE_IMAGES, 22 CONTENT_SETTINGS_TYPE_IMAGES,
23 CONTENT_SETTINGS_TYPE_JAVASCRIPT, 23 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
24 CONTENT_SETTINGS_TYPE_KEYGEN,
raymes 2015/11/05 03:15:47 nit: we tend to just add new ones at the end
svaldez 2015/11/05 16:30:26 Done.
24 CONTENT_SETTINGS_TYPE_PLUGINS, 25 CONTENT_SETTINGS_TYPE_PLUGINS,
25 CONTENT_SETTINGS_TYPE_POPUPS, 26 CONTENT_SETTINGS_TYPE_POPUPS,
26 CONTENT_SETTINGS_TYPE_GEOLOCATION, 27 CONTENT_SETTINGS_TYPE_GEOLOCATION,
27 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 28 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
28 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, 29 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
29 CONTENT_SETTINGS_TYPE_FULLSCREEN, 30 CONTENT_SETTINGS_TYPE_FULLSCREEN,
30 CONTENT_SETTINGS_TYPE_MOUSELOCK, 31 CONTENT_SETTINGS_TYPE_MOUSELOCK,
31 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, 32 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
32 CONTENT_SETTINGS_TYPE_MEDIASTREAM, // Deprecated. 33 CONTENT_SETTINGS_TYPE_MEDIASTREAM, // Deprecated.
33 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, 34 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
34 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, 35 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
35 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, 36 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,
36 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, 37 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
37 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 38 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
38 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, 39 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
39 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, 40 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
40 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, 41 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
41 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 42 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
42 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 43 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
43 #endif 44 #endif
44 CONTENT_SETTINGS_TYPE_APP_BANNER, 45 CONTENT_SETTINGS_TYPE_APP_BANNER,
45 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, 46 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
46 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, 47 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
47 48
48 // WARNING: This enum is going to be removed soon. Do not depend on NUM_TYPES. 49 // WARNING: This enum is going to be removed soon. Do not depend on NUM_TYPES.
49 CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE, 50 CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE,
50 }; 51 };
51 52
52 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ 53 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698