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

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

Issue 2582203003: Convert SetContentSettingRules to use mojo, part 1/2. (Closed)
Patch Set: Created 4 years 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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "components/content_settings/core/common/content_settings_pattern.h" 13 #include "components/content_settings/core/common/content_settings_pattern.h"
14 #include "components/content_settings/core/common/content_settings_types.h" 14 #include "components/content_settings/core/common/content_settings_types.h"
15 15
16 // Different settings that can be assigned for a particular content type. We 16 // Different settings that can be assigned for a particular content type. We
17 // give the user the ability to set these on a global and per-origin basis. 17 // give the user the ability to set these on a global and per-origin basis.
18 //
19 // A Mojo counterpart is at chrome/common/renderer_configuration*. This mirror
20 // type is not automatically generated or updated.
Sam McNally 2016/12/19 00:17:51 Add a TODO to migrate the Java users of this enum
nigeltao1 2016/12/22 04:09:46 Done.
21 //
18 // A Java counterpart will be generated for this enum. 22 // A Java counterpart will be generated for this enum.
19 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.preferences.website 23 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.preferences.website
20 // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ContentSettingValues 24 // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ContentSettingValues
21 enum ContentSetting { 25 enum ContentSetting {
22 CONTENT_SETTING_DEFAULT = 0, 26 CONTENT_SETTING_DEFAULT = 0,
23 CONTENT_SETTING_ALLOW, 27 CONTENT_SETTING_ALLOW,
24 CONTENT_SETTING_BLOCK, 28 CONTENT_SETTING_BLOCK,
25 CONTENT_SETTING_ASK, 29 CONTENT_SETTING_ASK,
26 CONTENT_SETTING_SESSION_ONLY, 30 CONTENT_SETTING_SESSION_ONLY,
27 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, 31 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // contains the patterns of the appling rule. 88 // contains the patterns of the appling rule.
85 struct SettingInfo { 89 struct SettingInfo {
86 SettingSource source; 90 SettingSource source;
87 ContentSettingsPattern primary_pattern; 91 ContentSettingsPattern primary_pattern;
88 ContentSettingsPattern secondary_pattern; 92 ContentSettingsPattern secondary_pattern;
89 }; 93 };
90 94
91 } // namespace content_settings 95 } // namespace content_settings
92 96
93 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ 97 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698