components/content_settings/core/common/content_settings_types.h - Issue 1991623005: Only Register() platform specific content settings types on different platforms

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1991623005: Only Register() platform specific content settings types on different platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: split the changes and register images, plugins, mouselock in this CL 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

« no previous file with comments | « components/content_settings/core/browser/website_settings_registry_unittest.cc ('k') | no next file » | no next file with comments »

OLD	NEW
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 19 matching lines...) Expand all Loading...
30 CONTENT_SETTINGS_TYPE_MOUSELOCK,	30 CONTENT_SETTINGS_TYPE_MOUSELOCK,

31 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,	31 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,

32 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,	32 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,

33 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,	33 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

34 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,	34 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,

35 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,	35 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,

36 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,	36 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,

37 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,	37 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,

38 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,	38 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

39 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,	39 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,

40 #if defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)

41 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,	40 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,

42 #endif

43 CONTENT_SETTINGS_TYPE_APP_BANNER,	41 CONTENT_SETTINGS_TYPE_APP_BANNER,

44 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,	42 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,

45 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,	43 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,

46 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,	44 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,

47 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,	45 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,

48 CONTENT_SETTINGS_TYPE_KEYGEN,	46 CONTENT_SETTINGS_TYPE_KEYGEN,

49 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,	47 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,

50 CONTENT_SETTINGS_TYPE_AUTOPLAY,	48 CONTENT_SETTINGS_TYPE_AUTOPLAY,

51	49

52 // 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.

53 CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE,	51 CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE,

54 };	52 };

55	53

56 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_	54 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_

OLD	NEW