OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_COMMON_CONTENT_SETTINGS_H_ | 5 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ |
6 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ | 6 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 25 matching lines...) Expand all Loading... |
36 // content settings types to a histogram. | 36 // content settings types to a histogram. |
37 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, | 37 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, |
38 size_t* num_values); | 38 size_t* num_values); |
39 | 39 |
40 struct ContentSettingPatternSource { | 40 struct ContentSettingPatternSource { |
41 ContentSettingPatternSource(const ContentSettingsPattern& primary_pattern, | 41 ContentSettingPatternSource(const ContentSettingsPattern& primary_pattern, |
42 const ContentSettingsPattern& secondary_patttern, | 42 const ContentSettingsPattern& secondary_patttern, |
43 ContentSetting setting, | 43 ContentSetting setting, |
44 const std::string& source, | 44 const std::string& source, |
45 bool incognito); | 45 bool incognito); |
| 46 ContentSettingPatternSource(const ContentSettingPatternSource& other); |
46 ContentSettingPatternSource(); | 47 ContentSettingPatternSource(); |
47 ContentSettingsPattern primary_pattern; | 48 ContentSettingsPattern primary_pattern; |
48 ContentSettingsPattern secondary_pattern; | 49 ContentSettingsPattern secondary_pattern; |
49 ContentSetting setting; | 50 ContentSetting setting; |
50 std::string source; | 51 std::string source; |
51 bool incognito; | 52 bool incognito; |
52 }; | 53 }; |
53 | 54 |
54 typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType; | 55 typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType; |
55 | 56 |
(...skipping 26 matching lines...) Expand all Loading... |
82 // contains the patterns of the appling rule. | 83 // contains the patterns of the appling rule. |
83 struct SettingInfo { | 84 struct SettingInfo { |
84 SettingSource source; | 85 SettingSource source; |
85 ContentSettingsPattern primary_pattern; | 86 ContentSettingsPattern primary_pattern; |
86 ContentSettingsPattern secondary_pattern; | 87 ContentSettingsPattern secondary_pattern; |
87 }; | 88 }; |
88 | 89 |
89 } // namespace content_settings | 90 } // namespace content_settings |
90 | 91 |
91 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ | 92 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ |
OLD | NEW |