ScreenCapture for Android phase1, part II

components/content_settings/core/common/content_settings.cc

 // Copyright (c) 2011 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.
 
 #include "components/content_settings/core/common/content_settings.h"
 
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
@@ skipping 38 matching lines @@
 #else
     CONTENT_SETTINGS_TYPE_DEFAULT,  // PROTECTED_MEDIA_IDENTIFIER (mobile only).
 #endif
     CONTENT_SETTINGS_TYPE_APP_BANNER,
     CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
     CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
     CONTENT_SETTINGS_TYPE_KEYGEN,
     CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,
     CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
     CONTENT_SETTINGS_TYPE_AUTOPLAY,
+#if defined(OS_ANDROID)

[raymes, 2016/07/13 02:44:09]

nit: I think we can remove the ifdef here

[braveyao, 2016/07/13 19:51:57]

Done.

+    CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN,
+#endif
 };
 
 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting,
                                        size_t* num_values) {
   // Translate the list above into a map for fast lookup.
   typedef base::hash_map<int, int> Map;
   CR_DEFINE_STATIC_LOCAL(Map, kMap, ());
   if (kMap.empty()) {
     for (size_t i = 0; i < arraysize(kHistogramOrder); ++i) {
       if (kHistogramOrder[i] != CONTENT_SETTINGS_TYPE_DEFAULT)
@@ skipping 21 matching lines @@
 ContentSettingPatternSource::ContentSettingPatternSource()
     : setting(CONTENT_SETTING_DEFAULT), incognito(false) {
 }
 
 ContentSettingPatternSource::ContentSettingPatternSource(
     const ContentSettingPatternSource& other) = default;
 
 RendererContentSettingRules::RendererContentSettingRules() {}
 
 RendererContentSettingRules::~RendererContentSettingRules() {}