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

Unified Diff: chrome/common/extensions/permissions/socket_permission_data.h

Issue 10993078: Use extensions socket permission for TCP/UDP socket APIs in Pepper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed Android build Created 8 years, 1 month 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/common/extensions/permissions/socket_permission_data.h
diff --git a/chrome/common/extensions/permissions/socket_permission_data.h b/chrome/common/extensions/permissions/socket_permission_data.h
index 19d08a76eba108ba95a16555a17f2264e2560575..a98d41abab8f0cc32a3cfec0ccb1f8a6be8b1d4d 100644
--- a/chrome/common/extensions/permissions/socket_permission_data.h
+++ b/chrome/common/extensions/permissions/socket_permission_data.h
@@ -6,6 +6,8 @@
#include <string>
+#include "content/public/common/socket_permission_request.h"
+
namespace extensions {
// A pattern that can be used to match socket permission.
@@ -25,14 +27,6 @@ namespace extensions {
// <port number between 0 and 65535>)
class SocketPermissionData {
public:
- enum OperationType {
- NONE = 0,
- TCP_CONNECT,
- TCP_LISTEN,
- UDP_BIND,
- UDP_SEND_TO,
- };
-
enum HostType {
ANY_HOST,
HOSTS_IN_DOMAINS,
@@ -47,7 +41,7 @@ class SocketPermissionData {
bool operator<(const SocketPermissionData& rhs) const;
bool operator==(const SocketPermissionData& rhs) const;
- bool Match(OperationType type, const std::string& host, int port) const;
+ bool Match(content::SocketPermissionRequest request) const;
bool Parse(const std::string& permission);
@@ -59,10 +53,8 @@ class SocketPermissionData {
private:
void Reset();
- OperationType type_;
- std::string host_;
+ content::SocketPermissionRequest pattern_;
bool match_subdomains_;
- int port_;
mutable std::string spec_;
};

Powered by Google App Engine
This is Rietveld 408576698