diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 05:04:36 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 05:04:36 +0000 |
| commit | a6910e7458ad8ce393b97696307230ceb12a6b77 (patch) | |
| tree | 24afa5b7b8a8c41a24755007e747a67b084d744f /chrome/browser/extensions/api/cookies | |
| parent | bebb1a87602202e572d4a817d5aa047d32a70cf0 (diff) | |
| download | chromium_src-a6910e7458ad8ce393b97696307230ceb12a6b77.zip chromium_src-a6910e7458ad8ce393b97696307230ceb12a6b77.tar.gz chromium_src-a6910e7458ad8ce393b97696307230ceb12a6b77.tar.bz2 | |
Remove PermissionsData::ForExtension() completely
There's no reason to have this. It was originally because PermissionsData
didn't really belong on Extension (and was to be taken off), but now that
PermissionsData is refactored to only include active permissions, it belongs
on the extension object.
TBR=ben@chromium.org (c/b/ui - simple refactor, no functional changes)
TBR=thestig@chromium.org (c/b/media_galleries - simple refactor, no functional changes)
BUG=379356
Review URL: https://codereview.chromium.org/315573003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/cookies')
| -rw-r--r-- | chrome/browser/extensions/api/cookies/cookies_api.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/cookies/cookies_helpers.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index b03a05a..cbb93dc 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -62,8 +62,7 @@ bool ParseUrl(ChromeAsyncExtensionFunction* function, } // Check against host permissions if needed. if (check_host_permissions && - !PermissionsData::ForExtension(function->GetExtension()) - ->HasHostPermission(*url)) { + !function->GetExtension()->permissions_data()->HasHostPermission(*url)) { function->SetError(ErrorUtils::FormatErrorMessage( keys::kNoHostPermissionsError, url->spec())); return false; diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index 71e5818..f22fc7d 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -136,8 +136,7 @@ void AppendMatchingCookiesToVector(const net::CookieList& all_cookies, // Ignore any cookie whose domain doesn't match the extension's // host permissions. GURL cookie_domain_url = GetURLFromCanonicalCookie(*it); - if (!PermissionsData::ForExtension(extension) - ->HasHostPermission(cookie_domain_url)) + if (!extension->permissions_data()->HasHostPermission(cookie_domain_url)) continue; // Filter the cookie using the match filter. cookies_helpers::MatchFilter filter(details); |