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 <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 void Init(); | 54 void Init(); |
55 | 55 |
56 // Register a new content setting. This maps an origin to an ALLOW/ASK/BLOCK | 56 // Register a new content setting. This maps an origin to an ALLOW/ASK/BLOCK |
57 // value (see the ContentSetting enum). | 57 // value (see the ContentSetting enum). |
58 void Register(ContentSettingsType type, | 58 void Register(ContentSettingsType type, |
59 const std::string& name, | 59 const std::string& name, |
60 ContentSetting initial_default_value, | 60 ContentSetting initial_default_value, |
61 WebsiteSettingsInfo::SyncStatus sync_status, | 61 WebsiteSettingsInfo::SyncStatus sync_status, |
62 const std::vector<std::string>& whitelisted_schemes, | 62 const std::vector<std::string>& whitelisted_schemes, |
63 const std::set<ContentSetting>& valid_settings, | 63 const std::set<ContentSetting>& valid_settings, |
64 WebsiteSettingsInfo::ScopingType scoping_type); | 64 WebsiteSettingsInfo::ScopingType scoping_type, |
| 65 ContentSettingsInfo::IncognitoBehavior incognito_behavior); |
65 | 66 |
66 Map content_settings_info_; | 67 Map content_settings_info_; |
67 WebsiteSettingsRegistry* website_settings_registry_; | 68 WebsiteSettingsRegistry* website_settings_registry_; |
68 | 69 |
69 DISALLOW_COPY_AND_ASSIGN(ContentSettingsRegistry); | 70 DISALLOW_COPY_AND_ASSIGN(ContentSettingsRegistry); |
70 }; | 71 }; |
71 | 72 |
72 } // namespace content_settings | 73 } // namespace content_settings |
73 | 74 |
74 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ | 75 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ |
OLD | NEW |