Only Register() platform specific content settings types on different platforms

components/content_settings/core/browser/website_settings_info.h

 // Copyright 2015 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_BROWSER_WEBSITE_SETTINGS_INFO_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 32 matching lines @@
   };
 
   enum IncognitoBehavior {
     // Settings will be inherited from regular to incognito profiles as usual.
     INHERIT_IN_INCOGNITO,
 
     // Settings will not be inherited from regular to incognito profiles.
     DONT_INHERIT_IN_INCOGNITO,
   };
 
+  // TODO(lshang): Remove this enum when content settings can be registered from
+  // within the component in which they are used. When this is possible then
+  // ifdefs can be contained within each component.
+  enum Platform : uint32_t {

[raymes, 2016/05/25 03:36:07]

We could also have
typedef uint32_t Platforms; 
to make the function signatures more descriptive when we pass this around

[lshang, 2016/05/25 10:38:16]

Done.

+    PLATFORM_WINDOWS = 1 << 0,
+    PLATFORM_LINUX = 1 << 1,
+    PLATFORM_CHROMEOS = 1 << 2,
+    PLATFORM_MAC = 1 << 3,
+    PLATFORM_ANDROID = 1 << 4,
+    PLATFORM_IOS = 1 << 5,
+
+    // Settings only applied to win, mac, linux and chromeos.
+    DESKTOP =
+        PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC,
+
+    // Settings applied to all platforms, including win, mac, linux, chromeos,
+    // android, ios.
+    ALL_PLATFORMS = DESKTOP | PLATFORM_ANDROID | PLATFORM_IOS,
+  };

[raymes, 2016/05/25 03:36:07]

Hmm should we just have this is WebsiteSettingsRegistry since it's not used
here?

[lshang, 2016/05/25 10:38:16]

Done.

+
   WebsiteSettingsInfo(ContentSettingsType type,
                       const std::string& name,
                       std::unique_ptr<base::Value> initial_default_value,
                       SyncStatus sync_status,
                       LossyStatus lossy_status,
                       ScopingType scoping_type,
                       IncognitoBehavior incognito_behavior);
   ~WebsiteSettingsInfo();
 
   ContentSettingsType type() const { return type_; }
@@ skipping 23 matching lines @@
   const LossyStatus lossy_status_;
   const ScopingType scoping_type_;
   const IncognitoBehavior incognito_behavior_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsInfo);
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_INFO_H_