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

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

Issue 620983002: Add Permissions to the PageInfo dialog on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page_info_dialog_shell_only_v2
Patch Set: Final rebase Created 6 years, 2 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
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
11 #include "components/content_settings/core/common/content_settings_pattern.h" 11 #include "components/content_settings/core/common/content_settings_pattern.h"
12 12
13 // 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
14 // 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.
15 // A Java counterpart will be generated for this enum.
16 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
15 enum ContentSetting { 17 enum ContentSetting {
16 CONTENT_SETTING_DEFAULT = 0, 18 CONTENT_SETTING_DEFAULT = 0,
17 CONTENT_SETTING_ALLOW, 19 CONTENT_SETTING_ALLOW,
18 CONTENT_SETTING_BLOCK, 20 CONTENT_SETTING_BLOCK,
19 CONTENT_SETTING_ASK, 21 CONTENT_SETTING_ASK,
20 CONTENT_SETTING_SESSION_ONLY, 22 CONTENT_SETTING_SESSION_ONLY,
21 CONTENT_SETTING_NUM_SETTINGS 23 CONTENT_SETTING_NUM_SETTINGS
22 }; 24 };
23 25
24 // Range-checked conversion of an int to a ContentSetting, for use when reading 26 // Range-checked conversion of an int to a ContentSetting, for use when reading
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // contains the patterns of the appling rule. 69 // contains the patterns of the appling rule.
68 struct SettingInfo { 70 struct SettingInfo {
69 SettingSource source; 71 SettingSource source;
70 ContentSettingsPattern primary_pattern; 72 ContentSettingsPattern primary_pattern;
71 ContentSettingsPattern secondary_pattern; 73 ContentSettingsPattern secondary_pattern;
72 }; 74 };
73 75
74 } // namespace content_settings 76 } // namespace content_settings
75 77
76 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_ 78 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698