Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(471)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest master Created 6 years, 6 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
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 1bd14b9fe2a5ec001d8ef7d527ee359295c40291..0c8f73371a16eb251f6c77c5b9605fa8b99053f1 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2507,19 +2507,18 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI(
extension_set) {
const Extension* extension = extension_set->GetByID(url.host());
if (extension) {
+ const extensions::PermissionsData* permissions_data =
+ extensions::PermissionsData::ForExtension(extension);
if (params) {
extensions::SocketPermission::CheckParam check_params(
params->type, params->host, params->port);
- if (extensions::PermissionsData::CheckAPIPermissionWithParam(
- extension, extensions::APIPermission::kSocket,
- &check_params)) {
- return true;
- }
- } else {
- if (extensions::PermissionsData::HasAPIPermission(
- extension, extensions::APIPermission::kSocket)) {
+ if (permissions_data->CheckAPIPermissionWithParam(
+ extensions::APIPermission::kSocket, &check_params)) {
return true;
}
+ } else if (permissions_data->HasAPIPermission(
+ extensions::APIPermission::kSocket)) {
+ return true;
}
}
}
« no previous file with comments | « chrome/browser/apps/ephemeral_app_launcher.cc ('k') | chrome/browser/extensions/active_script_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698