Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ | 5 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ |
| 6 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ | 6 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 56 | 56 |
| 57 // Register a new content setting. This maps an origin to an ALLOW/ASK/BLOCK | 57 // Register a new content setting. This maps an origin to an ALLOW/ASK/BLOCK |
| 58 // value (see the ContentSetting enum). | 58 // value (see the ContentSetting enum). |
| 59 void Register(ContentSettingsType type, | 59 void Register(ContentSettingsType type, |
| 60 const std::string& name, | 60 const std::string& name, |
| 61 ContentSetting initial_default_value, | 61 ContentSetting initial_default_value, |
| 62 WebsiteSettingsInfo::SyncStatus sync_status, | 62 WebsiteSettingsInfo::SyncStatus sync_status, |
| 63 const std::vector<std::string>& whitelisted_schemes, | 63 const std::vector<std::string>& whitelisted_schemes, |
| 64 const std::set<ContentSetting>& valid_settings, | 64 const std::set<ContentSetting>& valid_settings, |
| 65 WebsiteSettingsInfo::ScopingType scoping_type, | 65 WebsiteSettingsInfo::ScopingType scoping_type, |
| 66 uint32_t platform, | |
|
raymes
2016/05/25 03:36:07
nit: platforms?
Also I think we should add a comm
lshang
2016/05/25 10:38:16
Done.
| |
| 66 ContentSettingsInfo::IncognitoBehavior incognito_behavior); | 67 ContentSettingsInfo::IncognitoBehavior incognito_behavior); |
| 67 | 68 |
| 68 Map content_settings_info_; | 69 Map content_settings_info_; |
| 69 WebsiteSettingsRegistry* website_settings_registry_; | 70 WebsiteSettingsRegistry* website_settings_registry_; |
| 70 | 71 |
| 71 DISALLOW_COPY_AND_ASSIGN(ContentSettingsRegistry); | 72 DISALLOW_COPY_AND_ASSIGN(ContentSettingsRegistry); |
| 72 }; | 73 }; |
| 73 | 74 |
| 74 } // namespace content_settings | 75 } // namespace content_settings |
| 75 | 76 |
| 76 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ | 77 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ |
| OLD | NEW |