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

Side by Side Diff: components/content_settings/core/browser/content_settings_registry.h

Issue 1442083002: Stop inheriting push notification permissions from regular to incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed mvanouwerkerk's review comments Created 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ 5 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_
6 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ 6 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 void Init(); 55 void Init();
56 56
57 // Register a new content setting. This maps an origin to an ALLOW/ASK/BLOCK 57 // Register a new content setting. This maps an origin to an ALLOW/ASK/BLOCK
58 // value (see the ContentSetting enum). 58 // value (see the ContentSetting enum).
59 void Register(ContentSettingsType type, 59 void Register(ContentSettingsType type,
60 const std::string& name, 60 const std::string& name,
61 ContentSetting initial_default_value, 61 ContentSetting initial_default_value,
62 WebsiteSettingsInfo::SyncStatus sync_status, 62 WebsiteSettingsInfo::SyncStatus sync_status,
63 const std::vector<std::string>& whitelisted_schemes, 63 const std::vector<std::string>& whitelisted_schemes,
64 const std::set<ContentSetting>& valid_settings, 64 const std::set<ContentSetting>& valid_settings,
65 WebsiteSettingsInfo::ScopingType scoping_type); 65 WebsiteSettingsInfo::ScopingType scoping_type,
66 WebsiteSettingsInfo::IncognitoBehavior incognito_behavior);
66 67
67 Map content_settings_info_; 68 Map content_settings_info_;
68 WebsiteSettingsRegistry* website_settings_registry_; 69 WebsiteSettingsRegistry* website_settings_registry_;
69 70
70 DISALLOW_COPY_AND_ASSIGN(ContentSettingsRegistry); 71 DISALLOW_COPY_AND_ASSIGN(ContentSettingsRegistry);
71 }; 72 };
72 73
73 } // namespace content_settings 74 } // namespace content_settings
74 75
75 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_ 76 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698