chrome/browser/extensions/api/content_settings/content_settings_api.cc - Issue 2655443003: Unify the "get" and "set" cookie access settings.

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/extensions/api/content_settings/content_settings_api.cc

Issue 2655443003: Unify the "get" and "set" cookie access settings. (Closed)

Patch Set: rebase 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 | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

index 405ad5b0ecc99ffa9cfbf6e816789b7d38867f64..c63d8f45e015fc794c3b8d4ccf7e9ed7c85be237 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

@@ -153,9 +153,8 @@ ContentSettingsContentSettingGetFunction::Run() {

ContentSetting setting;

if (content_type == CONTENT_SETTINGS_TYPE_COOKIES) {

- // TODO(jochen): Do we return the value for setting or for reading cookies?

cookie_settings->GetCookieSetting(primary_url, secondary_url, nullptr,

- nullptr /* reading_setting */, &setting);

+ &setting);

} else {

setting = map->GetContentSetting(primary_url, secondary_url, content_type,

resource_identifier);