chrome/common/content_settings.h - Issue 410993002: Componentize content_settings_types.h

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: remove the dependency of content_settings.h on content_settings_types.h Created 6 years, 4 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

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 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"

13	12

14 // Different settings that can be assigned for a particular content type. We	13 // 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.	14 // give the user the ability to set these on a global and per-origin basis.

16 enum ContentSetting {	15 enum ContentSetting {

17 CONTENT_SETTING_DEFAULT = 0,	16 CONTENT_SETTING_DEFAULT = 0,

18 CONTENT_SETTING_ALLOW,	17 CONTENT_SETTING_ALLOW,

19 CONTENT_SETTING_BLOCK,	18 CONTENT_SETTING_BLOCK,

20 CONTENT_SETTING_ASK,	19 CONTENT_SETTING_ASK,

21 CONTENT_SETTING_SESSION_ONLY,	20 CONTENT_SETTING_SESSION_ONLY,

22 CONTENT_SETTING_NUM_SETTINGS	21 CONTENT_SETTING_NUM_SETTINGS

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 // contains the patterns of the appling rule.	67 // contains the patterns of the appling rule.

69 struct SettingInfo {	68 struct SettingInfo {

70 SettingSource source;	69 SettingSource source;

71 ContentSettingsPattern primary_pattern;	70 ContentSettingsPattern primary_pattern;

72 ContentSettingsPattern secondary_pattern;	71 ContentSettingsPattern secondary_pattern;

73 };	72 };

74	73

75 } // namespace content_settings	74 } // namespace content_settings

76	75

77 #endif // CHROME_COMMON_CONTENT_SETTINGS_H_	76 #endif // CHROME_COMMON_CONTENT_SETTINGS_H_

OLD	NEW

« no previous file with comments | « chrome/common/common_param_traits_macros.h ('k') | chrome/common/content_settings_types.h » ('j') | components/content_settings/DEPS » ('J')