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

Unified Diff: extensions/common/api/sockets/sockets_manifest_permission.cc

Issue 795543002: Added PermissionIDSet to APIPermissions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permissions_patch_1_static_initializer_fix
Patch Set: Removed unnecessary constructor and added tests for API permissions Created 6 years 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: extensions/common/api/sockets/sockets_manifest_permission.cc
diff --git a/extensions/common/api/sockets/sockets_manifest_permission.cc b/extensions/common/api/sockets/sockets_manifest_permission.cc
index d248d28524f7304eae822fea731eaf8da09a318f..b20285ed9b68d55d09a5bb321dd194e4f0942f0a 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission.cc
@@ -318,15 +318,11 @@ void SocketsManifestPermission::AddSubdomainHostMessage(
std::vector<base::string16>(domains.begin(), domains.end()),
' '))));
// TODO(sashab): Add rules to ChromePermissionMessageProvider:
- // kSocketDomainHostsSingular ->
- // IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN
- // kSocketDomainHostsPlural ->
- // IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS
- APIPermission::ID pid = (domains.size() == 1)
- ? APIPermission::kSocketDomainHostsSingular
- : APIPermission::kSocketDomainHostsPlural;
+ // kSocketDomainHosts ->
+ // IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN if 1
+ // IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS if many
for (const auto& domain : domains)
- ids.insert(pid, domain);
+ ids.insert(APIPermission::kSocketDomainHosts, domain);
}
}
@@ -354,15 +350,11 @@ void SocketsManifestPermission::AddSpecificHostMessage(
std::vector<base::string16>(hostnames.begin(), hostnames.end()),
' '))));
// TODO(sashab): Add rules to ChromePermissionMessageProvider:
- // kSocketSpecificHostsSingular ->
- // IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST
- // kSocketSpecificHostsPlural ->
- // IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS
- APIPermission::ID pid = (hostnames.size() == 1)
- ? APIPermission::kSocketSpecificHostsSingular
- : APIPermission::kSocketSpecificHostsPlural;
+ // kSocketSpecificHosts ->
+ // IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST if 1
+ // IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS if many
for (const auto& hostname : hostnames)
- ids.insert(pid, hostname);
+ ids.insert(APIPermission::kSocketSpecificHosts, hostname);
}
}

Powered by Google App Engine
This is Rietveld 408576698