chrome/browser/content_settings/content_settings_supervised_provider.h - Issue 2628883008: Add a supervised user setting to allow all cookies.

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

Issue 2628883008: Add a supervised user setting to allow all cookies. (Closed)

Patch Set: . Created 3 years, 11 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 | « no previous file | chrome/browser/content_settings/content_settings_supervised_provider.cc » ('j') | chrome/browser/supervised_user/child_accounts/child_account_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_supervised_provider.h

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

index c45036441b7ddceff83d4aca9621eb1981d3490d..a66e3ac713ea96a9ef7fc4a220473ba1edd3028f 100644

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

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

@@ -10,7 +10,7 @@

#include "base/callback_list.h"

#include "base/macros.h"

#include "base/synchronization/lock.h"

-#include "components/content_settings/core/browser/content_settings_binary_value_map.h"

+#include "components/content_settings/core/browser/content_settings_global_value_map.h"

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

class SupervisedUserSettingsService;

@@ -41,11 +41,11 @@ class SupervisedProvider : public ObservableProvider {

void ShutdownOnUIThread() override;

+ private:

// Callback on receiving settings from the supervised user settings service.

void OnSupervisedSettingsAvailable(const base::DictionaryValue* settings);

- private:

- BinaryValueMap value_map_;

+ GlobalValueMap value_map_;

// Used around accesses to the |value_map_| object to guarantee

// thread safety.