ScreenCapture for Android phase1, part II

components/content_settings/core/common/content_settings_types.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
 
 #include "build/build_config.h"
 
 // A particular type of content to care about.  We give the user various types
@@ skipping 13 matching lines @@
   CONTENT_SETTINGS_TYPE_PLUGINS,
   CONTENT_SETTINGS_TYPE_POPUPS,
   CONTENT_SETTINGS_TYPE_GEOLOCATION,
   CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
   CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
   CONTENT_SETTINGS_TYPE_FULLSCREEN,
   CONTENT_SETTINGS_TYPE_MOUSELOCK,
   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,
   CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
   CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
   CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
   CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
   CONTENT_SETTINGS_TYPE_APP_BANNER,
   CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
   CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
   CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,
   CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,
   CONTENT_SETTINGS_TYPE_KEYGEN,
   CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
   CONTENT_SETTINGS_TYPE_AUTOPLAY,
 
   // WARNING: This enum is going to be removed soon. Do not depend on NUM_TYPES.
   CONTENT_SETTINGS_NUM_TYPES_DO_NOT_USE,
 };
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_