components/content_settings/core/common/content_settings_types.h - Issue 369703002: Remember user decisions on invalid certificates behind a flag

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 369703002: Remember user decisions on invalid certificates behind a flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed broken include Created 6 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/test/base/testing_profile.cc ('k') | content/browser/download/download_manager_impl_unittest.cc » ('j') | content/browser/ssl/ssl_host_state.cc » ('J')

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 // A particular type of content to care about. We give the user various types	8 // A particular type of content to care about. We give the user various types

9 // of controls over each of these.	9 // of controls over each of these.

10 enum ContentSettingsType {	10 enum ContentSettingsType {

(...skipping 12 matching lines...) Expand all Loading...
23 CONTENT_SETTINGS_TYPE_MOUSELOCK,	23 CONTENT_SETTINGS_TYPE_MOUSELOCK,

24 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,	24 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,

25 CONTENT_SETTINGS_TYPE_MEDIASTREAM, // Default setting for MIC and CAMERA.	25 CONTENT_SETTINGS_TYPE_MEDIASTREAM, // Default setting for MIC and CAMERA.

26 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,	26 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,

27 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,	27 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

28 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,	28 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,

29 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,	29 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,

30 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,	30 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,

31 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,	31 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,

32 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,	32 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

	33 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,

33 #if defined(OS_WIN)	34 #if defined(OS_WIN)

34 CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,	35 CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,

35 #elif defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)	36 #elif defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)

36 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,	37 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,

37 #endif	38 #endif

38 #if defined(OS_ANDROID)	39 #if defined(OS_ANDROID)

39 CONTENT_SETTINGS_TYPE_APP_BANNER,	40 CONTENT_SETTINGS_TYPE_APP_BANNER,

40 #endif	41 #endif

41 CONTENT_SETTINGS_NUM_TYPES,	42 CONTENT_SETTINGS_NUM_TYPES,

42 };	43 };

43	44

44 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_	45 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_

OLD	NEW