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

Side by Side Diff: chrome/common/content_settings.h

Issue 410993002: Componentize content_settings_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk Created 6 years, 5 months 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 | Annotate | Revision Log
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 CHROME_COMMON_CONTENT_SETTINGS_H_ 5 #ifndef CHROME_COMMON_CONTENT_SETTINGS_H_
6 #define CHROME_COMMON_CONTENT_SETTINGS_H_ 6 #define CHROME_COMMON_CONTENT_SETTINGS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "chrome/common/content_settings_pattern.h" 11 #include "chrome/common/content_settings_pattern.h"
12 #include "chrome/common/content_settings_types.h" 12 #include "components/content_settings/core/common/content_settings_types.h"
13 13
14 // Different settings that can be assigned for a particular content type. We 14 // Different settings that can be assigned for a particular content type. We
15 // give the user the ability to set these on a global and per-origin basis. 15 // give the user the ability to set these on a global and per-origin basis.
16 enum ContentSetting { 16 enum ContentSetting {
17 CONTENT_SETTING_DEFAULT = 0, 17 CONTENT_SETTING_DEFAULT = 0,
18 CONTENT_SETTING_ALLOW, 18 CONTENT_SETTING_ALLOW,
19 CONTENT_SETTING_BLOCK, 19 CONTENT_SETTING_BLOCK,
20 CONTENT_SETTING_ASK, 20 CONTENT_SETTING_ASK,
21 CONTENT_SETTING_SESSION_ONLY, 21 CONTENT_SETTING_SESSION_ONLY,
22 CONTENT_SETTING_NUM_SETTINGS 22 CONTENT_SETTING_NUM_SETTINGS
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // contains the patterns of the appling rule. 68 // contains the patterns of the appling rule.
69 struct SettingInfo { 69 struct SettingInfo {
70 SettingSource source; 70 SettingSource source;
71 ContentSettingsPattern primary_pattern; 71 ContentSettingsPattern primary_pattern;
72 ContentSettingsPattern secondary_pattern; 72 ContentSettingsPattern secondary_pattern;
73 }; 73 };
74 74
75 } // namespace content_settings 75 } // namespace content_settings
76 76
77 #endif // CHROME_COMMON_CONTENT_SETTINGS_H_ 77 #endif // CHROME_COMMON_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698