chrome/common/content_settings_types.h - Issue 31043008: Changed platform verification user consent logic to be per-domain.

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: chrome/common/content_settings_types.h

Issue 31043008: Changed platform verification user consent logic to be per-domain. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix browser_tests Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

OLD	NEW
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 #ifndef CHROME_COMMON_CONTENT_SETTINGS_TYPES_H_	5 #ifndef CHROME_COMMON_CONTENT_SETTINGS_TYPES_H_

6 #define CHROME_COMMON_CONTENT_SETTINGS_TYPES_H_	6 #define CHROME_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 14 matching lines...) Expand all Loading...
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_SAVE_PASSWORD,	32 CONTENT_SETTINGS_TYPE_SAVE_PASSWORD,

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

34 CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,	34 CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,

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

36 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,	36 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,

37 #endif	37 #endif

38 CONTENT_SETTINGS_NUM_TYPES,	38 CONTENT_SETTINGS_NUM_TYPES,

39 };	39 };

40	40

41 #endif // CHROME_COMMON_CONTENT_SETTINGS_TYPES_H_	41 #endif // CHROME_COMMON_CONTENT_SETTINGS_TYPES_H_

OLD	NEW