components/content_settings/core/browser/host_content_settings_map.cc - Issue 1991623005: Only Register() platform specific content settings types on different platforms

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/host_content_settings_map.cc

Issue 1991623005: Only Register() platform specific content settings types on different platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: test Created 4 years, 7 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_registry.cc ('K') | « components/content_settings/core/browser/content_settings_registry_unittest.cc ('k') | components/content_settings/core/browser/website_settings_info.h » ('j') | components/content_settings/core/browser/website_settings_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/host_content_settings_map.cc

diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc

index 67321bd14d92e837c430cad08ea72eb808450eb9..933abcd1acd8380ad87244ad8588351967f659f6 100644

--- a/components/content_settings/core/browser/host_content_settings_map.cc

+++ b/components/content_settings/core/browser/host_content_settings_map.cc

@@ -171,8 +171,10 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,

default_provider->AddObserver(this);

content_settings_providers_[DEFAULT_PROVIDER] = default_provider;

+// ios doesn't have KEYGEN to be migrated.

+#if !defined(OS_IOS)

msramek 2016/05/23 14:49:49 To make sure this stays in sync, could we just che

lshang 2016/05/24 11:55:46 Done.

MigrateOldSettings();

+#endif

RecordNumberOfExceptions();

}