chrome/browser/content_settings/content_settings_override_provider.h - Issue 596613002: Remove content dependencies from content settings providers.

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: chrome/browser/content_settings/content_settings_override_provider.h

Issue 596613002: Remove content dependencies from content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: browser_tests fix Created 6 years, 3 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

« no previous file with comments | « chrome/browser/content_settings/content_settings_internal_extension_provider.cc ('k') | chrome/browser/content_settings/content_settings_override_provider.cc » ('j') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_override_provider.h

diff --git a/chrome/browser/content_settings/content_settings_override_provider.h b/chrome/browser/content_settings/content_settings_override_provider.h

index bcbd3eee61d7e2fc17696a5be999aca445402232..b123c491a849b7b5b5e0a01e018511a3886cdbee 100644

--- a/chrome/browser/content_settings/content_settings_override_provider.h

+++ b/chrome/browser/content_settings/content_settings_override_provider.h

@@ -7,6 +7,7 @@

#include "base/macros.h"

#include "base/synchronization/lock.h"

+#include "base/threading/thread_checker.h"

#include "components/content_settings/core/browser/content_settings_provider.h"

#include "components/content_settings/core/common/content_settings_types.h"

@@ -71,6 +72,8 @@ class OverrideProvider : public ProviderInterface {

// guarantee thread safety.

mutable base::Lock lock_;

+ base::ThreadChecker thread_checker_;

DISALLOW_COPY_AND_ASSIGN(OverrideProvider);

};