components/content_settings/core/common/content_settings_types.h - Issue 2123863004: ScreenCapture for Android phase1, part II

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

Issue 2123863004: ScreenCapture for Android phase1, part II (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase to #407492(Jul 25) Created 4 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

« components/content_settings/core/browser/content_settings_registry.cc ('K') | « components/content_settings/core/common/content_settings.cc ('k') | content/browser/BUILD.gn » ('j') | content/browser/renderer_host/media/peer_connection_tracker_host.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 28 matching lines...) Expand all Loading...
39 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,	39 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,

40 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,	40 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,

41 CONTENT_SETTINGS_TYPE_APP_BANNER,	41 CONTENT_SETTINGS_TYPE_APP_BANNER,

42 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,	42 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,

43 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,	43 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,

44 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,	44 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,

45 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,	45 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,

46 CONTENT_SETTINGS_TYPE_KEYGEN,	46 CONTENT_SETTINGS_TYPE_KEYGEN,

47 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,	47 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,

48 CONTENT_SETTINGS_TYPE_AUTOPLAY,	48 CONTENT_SETTINGS_TYPE_AUTOPLAY,

	49 CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN,
	Sergey Ulanov 2016/08/01 18:20:36 Why do we need this content setting? Is it only fo Why do we need this content setting? Is it only for the case the user checks "Don't show again" check box on the permission prompt? braveyao 2016/08/03 00:23:47 The reason is we use the definition to distinguish Show quoted text On 2016/08/01 18:20:36, Sergey Ulanov wrote: > Why do we need this content setting? Is it only for the case the user checks > "Don't show again" check box on the permission prompt? The reason is we use the definition to distinguish the stream type too. See chrome/browser/media/media_stream_infobar_delegate_android.cc. That's the only reason I add it here. Otherwise it's not needed since no content setting for screen capture at all.
49	50

50 // WARNING: This enum is going to be removed soon. Do not depend on NUM_TYPES.	51 // WARNING: This enum is going to be removed soon. Do not depend on NUM_TYPES.

51 CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE,	52 CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE,

52 };	53 };

53	54

54 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_	55 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_

OLD	NEW