ScreenCapture for Android phase1, part II

components/content_settings/core/common/content_settings_types.h

Index: components/content_settings/core/common/content_settings_types.h
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
index dc8cf6f5b82bcb31c69049779d3f49c4fce8b740..4579d2690ff925b5b2e7f99b7f2685923fbd0a4d 100644
--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
@@ -31,6 +31,9 @@ enum ContentSettingsType {
   CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
   CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
   CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
+#if defined(OS_ANDROID)
+  CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN,

[msramek, 2016/07/08 10:56:48]

Drive by!

1. The platform #ifdef does not belong here, please remove it (instead, make a
corresponding entry in ContentSettingsRegistry and specify the platform there).

2. Please add a corresponding entry to the histogram enum in
content_settings_types.cc.

3. New content settings are normally added to the end of the enum. I can imagine
making an exception here, but since new entries in kHistogramOrder[] in
ContentSettingsType *must* be added to the end, perhaps it's better to add this
to the end as well to keep them in sync.

[braveyao, 2016/07/11 21:42:58]

Done.

+#endif
   CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,
   CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
   CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,