components/content_settings/core/browser/host_content_settings_map.h - Issue 2158743002: Register a pref to control migration status

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.h

Issue 2158743002: Register a pref to control migration status (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@change_scoping_type

Patch Set: add some comments to test Created 4 years, 5 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

« chrome/browser/content_settings/host_content_settings_map_unittest.cc ('K') | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | components/content_settings/core/browser/host_content_settings_map.cc » ('j') | components/content_settings/core/browser/host_content_settings_map.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9115c2836a932b70c52fada8c8d6c27a991f454e..6b0f04e88176a1c09b5d8c131648ce25256979f1 100644

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

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

@@ -280,6 +280,7 @@ class HostContentSettingsMap : public content_settings::Observer,

private:

friend class base::RefCountedThreadSafe<HostContentSettingsMap>;

+ friend class HostContentSettingsMapTest_DomainToOriginMigrationStatus_Test;

friend class HostContentSettingsMapTest_MigrateDomainScopedSettings_Test;

friend class HostContentSettingsMapTest_MigrateKeygenSettings_Test;

@@ -318,7 +319,7 @@ class HostContentSettingsMap : public content_settings::Observer,

// issues.

// TODO(lshang): https://crbug.com/621398 Remove this when clients have

// migrated (~M56).

- void MigrateDomainScopedSettings();

+ void MigrateDomainScopedSettings(bool after_sync);

raymes 2016/07/21 00:58:54 nit: Please add a comment for |after_sync|

lshang 2016/07/22 01:33:07 Done.

// Collect UMA data about the number of exceptions.

void RecordNumberOfExceptions();