Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: components/content_settings/core/common/content_settings.h

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing test_runner. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 bool incognito; 49 bool incognito;
50 }; 50 };
51 51
52 typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType; 52 typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType;
53 53
54 struct RendererContentSettingRules { 54 struct RendererContentSettingRules {
55 RendererContentSettingRules(); 55 RendererContentSettingRules();
56 ~RendererContentSettingRules(); 56 ~RendererContentSettingRules();
57 ContentSettingsForOneType image_rules; 57 ContentSettingsForOneType image_rules;
58 ContentSettingsForOneType script_rules; 58 ContentSettingsForOneType script_rules;
59 ContentSettingsForOneType keygen_rules;
Bernhard Bauer 2015/11/05 11:20:14 You only need these rules for content settings tha
svaldez 2015/11/05 16:30:26 Done.
59 }; 60 };
60 61
61 namespace content_settings { 62 namespace content_settings {
62 63
63 typedef std::string ResourceIdentifier; 64 typedef std::string ResourceIdentifier;
64 65
65 // Enum containing the various source for content settings. Settings can be 66 // Enum containing the various source for content settings. Settings can be
66 // set by policy, extension, the user or by the custodian of a supervised user. 67 // set by policy, extension, the user or by the custodian of a supervised user.
67 // Certain (internal) schemes are whilelisted. For whilelisted schemes the 68 // Certain (internal) schemes are whilelisted. For whilelisted schemes the
68 // source is |SETTING_SOURCE_WHITELIST|. 69 // source is |SETTING_SOURCE_WHITELIST|.
(...skipping 11 matching lines...) Expand all
80 // contains the patterns of the appling rule. 81 // contains the patterns of the appling rule.
81 struct SettingInfo { 82 struct SettingInfo {
82 SettingSource source; 83 SettingSource source;
83 ContentSettingsPattern primary_pattern; 84 ContentSettingsPattern primary_pattern;
84 ContentSettingsPattern secondary_pattern; 85 ContentSettingsPattern secondary_pattern;
85 }; 86 };
86 87
87 } // namespace content_settings 88 } // namespace content_settings
88 89
89 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ 90 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698