chrome/browser/extensions/api/cookies/cookies_api.cc - Issue 14651017: Move RuntimeData and related permissions out of Extension class

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/cookies/cookies_api.cc

Issue 14651017: Move RuntimeData and related permissions out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_permissions

Patch Set: Latest master Created 7 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

« no previous file with comments | « chrome/browser/extensions/api/bluetooth/bluetooth_api.cc ('k') | chrome/browser/extensions/api/cookies/cookies_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/cookies/cookies_api.cc

diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc

index f15c1a3d7083fa9fa4852403665fff43044830f1..72fc053ad9f0b8c4c9954b67e792378547028137 100644

--- a/chrome/browser/extensions/api/cookies/cookies_api.cc

+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/extensions/api/cookies.h"

#include "chrome/common/extensions/extension.h"

+#include "chrome/common/extensions/permissions/permissions_data.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

#include "extensions/common/error_utils.h"

@@ -149,7 +150,8 @@ bool CookiesFunction::ParseUrl(const std::string& url_string, GURL* url,

return false;

}

// Check against host permissions if needed.

- if (check_host_permissions && !GetExtension()->HasHostPermission(*url)) {

+ if (check_host_permissions &&

+ !PermissionsData::HasHostPermission(GetExtension(), *url)) {

error_ = ErrorUtils::FormatErrorMessage(

keys::kNoHostPermissionsError, url->spec());

return false;