Move pref names and default value into WebsiteSettingsInfo

components/content_settings/core/browser/website_settings_registry.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_REGISTRY_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_REGISTRY_H_
 
 #include <string>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "components/content_settings/core/browser/website_settings_info.h"
+#include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 
 namespace content_settings {
 
 // This class stores WebsiteSettingsInfo objects for each website setting in the
 // system and provides access to them. Global instances can be fetched and
 // methods called from from any thread because all of its public methods are
 // const.
 class WebsiteSettingsRegistry {
  public:
   static WebsiteSettingsRegistry* GetInstance();
 
   const WebsiteSettingsInfo* Get(ContentSettingsType type) const;
   const WebsiteSettingsInfo* GetByName(const std::string& name) const;
 
  private:
+  friend class WebsiteSettingsRegistryTest;
+  friend struct base::DefaultLazyInstanceTraits<WebsiteSettingsRegistry>;
+
   WebsiteSettingsRegistry();
   ~WebsiteSettingsRegistry();
 
   // Register a new WebsiteSettingsInfo.
   void Register(ContentSettingsType type, const std::string& name);
+  // Register a new WebsiteSettingsInfo for a permission-like setting.

[msramek, 2015/07/29 09:20:07]

In our past discussions, we used the word "permission" to refer to media,
location etc. as opposed to e.g. images (which is very much a *content setting*,
not a requested permission), so this is not so clear.

Please expand the comment to explain what is permission-like, i.e. has a scalar
ALLOW / ASK / BLOCK / ... value and not an arbitrary dictionary.

[Bernhard Bauer, 2015/07/29 10:12:39]

In the past, we've used the term "compound" for content types that can't be
mapped to a ContentSetting (because they're a ListValue or DictionaryValue).

[raymes, 2015/07/30 05:25:03]

I've named them RegisterWebsiteSetting and RegisterContentSetting because I
think this is also how we refer to them currently. Website settings have
arbitrary data and content settings have allow/ask/block/etc. WDYT?

[msramek, 2015/07/31 15:27:49]

That's the terminology from this document, right?
https://docs.google.com/document/d/1U8S5k9WRFC53R611CRGAlYVuHNxjZGph3WPonkCTuzk/

So SGTM. ( personally, I've been calling them content settings the whole time,
since that's how everything in the code is named. :) )

+  void RegisterPermission(ContentSettingsType type,
+                          const std::string& name,
+                          ContentSetting initial_default_value);
+
+  // Helper used by Register/RegisterPermission.
+  void StoreWebsiteSettingsInfo(WebsiteSettingsInfo* info);
 
   ScopedVector<WebsiteSettingsInfo> website_settings_info_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsRegistry);
-  friend class WebsiteSettingsRegistryTest;
-  friend struct base::DefaultLazyInstanceTraits<WebsiteSettingsRegistry>;
 };
 
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_WEBSITE_SETTINGS_REGISTRY_H_