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

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: Fixing ContentSetting Register. 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
(...skipping 27 matching lines...) Expand all
38 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, 38 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
39 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, 39 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
40 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, 40 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
41 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 41 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
42 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 42 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
43 #endif 43 #endif
44 CONTENT_SETTINGS_TYPE_APP_BANNER, 44 CONTENT_SETTINGS_TYPE_APP_BANNER,
45 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, 45 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
46 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, 46 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
47 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, 47 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,
48 CONTENT_SETTINGS_TYPE_KEYGEN,
48 49
49 // WARNING: This enum is going to be removed soon. Do not depend on NUM_TYPES. 50 // WARNING: This enum is going to be removed soon. Do not depend on NUM_TYPES.
50 CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE, 51 CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE,
51 }; 52 };
52 53
53 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ 54 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
OLDNEW
« no previous file with comments | « components/content_settings/core/common/content_settings.cc ('k') | components/content_settings/core/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698