components/content_settings/core/browser/content_settings_registry.h - Issue 1320673013: Remove HostContentSettingsMap::IsSettingAllowedForType

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

Unified Diff: components/content_settings/core/browser/content_settings_registry.h

Issue 1320673013: Remove HostContentSettingsMap::IsSettingAllowedForType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-issetting-allowed

Patch Set: Created 5 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 side-by-side diff with in-line comments

Download patch

« components/content_settings/core/browser/content_settings_info.cc ('K') | « components/content_settings/core/browser/content_settings_pref.cc ('k') | components/content_settings/core/browser/content_settings_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_registry.h

diff --git a/components/content_settings/core/browser/content_settings_registry.h b/components/content_settings/core/browser/content_settings_registry.h

index 799054ea88d838f119e7dd99e44de74194dc0648..c0e6b734e9745599da58665213b25d4755b47c24 100644

--- a/components/content_settings/core/browser/content_settings_registry.h

+++ b/components/content_settings/core/browser/content_settings_registry.h

@@ -5,7 +5,9 @@

#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_

#define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_REGISTRY_H_

+#include <set>

#include <string>

+#include <vector>

#include "base/containers/scoped_ptr_map.h"

#include "base/lazy_instance.h"

@@ -58,7 +60,8 @@ class ContentSettingsRegistry {

const std::string& name,

ContentSetting initial_default_value,

WebsiteSettingsInfo::SyncStatus sync_status,

- const std::vector<std::string>& whitelisted_schemes);

+ const std::vector<std::string>& whitelisted_schemes,

+ const std::set<ContentSetting>& valid_settings);

Map content_settings_info_;

WebsiteSettingsRegistry* website_settings_registry_;