Added PermissionIDSet to APIPermissions

extensions/common/permissions/api_permission.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/values.h"
 #include "extensions/common/permissions/permission_message.h"
 
 namespace IPC {
 class Message;
 }
 
 namespace extensions {
 
+class PermissionIDSet;
 class APIPermissionInfo;
 class ChromeAPIPermissions;
 
 // APIPermission is for handling some complex permissions. Please refer to
 // extensions::SocketPermission as an example.
 // There is one instance per permission per loaded extension.
 class APIPermission {
  public:
   // The IDs of all permissions available to apps. Add as many permissions here
   // as needed to generate meaningful permission messages. Add the rules for the
@@ skipping 174 matching lines @@
     // permission message rule combinations.
     // TODO(sashab): Move these in-line with the other permission IDs.
     kBluetooth,
     kBluetoothDevices,
     kFavicon,
     kFullAccess,
     kHostReadOnly,
     kHostReadWrite,
     kHostsAll,
     kHostsAllReadOnly,
+    kMediaGalleriesAllGalleriesCopyTo,
+    kMediaGalleriesAllGalleriesDelete,
+    kMediaGalleriesAllGalleriesRead,
+    kNetworkState,
     kOverrideBookmarksUI,
+    kShouldWarnAllHosts,
     kSocketAnyHost,
-    kSocketDomainHostsSingular,
-    kSocketDomainHostsPlural,
-    kSocketSpecificHostsSingular,
-    kSocketSpecificHostsPlural,
-    kNetworkState,
+    kSocketDomainHosts,
+    kSocketSpecificHosts,
+    kUsbDeviceList,
+    kUsbDeviceUnknownProduct,
+    kUsbDeviceUnknownVendor,
 
     kEnumBoundary
   };
 
   struct CheckParam {
   };
 
   explicit APIPermission(const APIPermissionInfo* info);
 
   virtual ~APIPermission();
 
   // Returns the id of this permission.
   ID id() const;
 
   // Returns the name of this permission.
   const char* name() const;
 
   // Returns the APIPermission of this permission.
   const APIPermissionInfo* info() const {
     return info_;
   }
 
+  // The set of permissions this API permission has. These permissions are used

[Yoyo Zhou, 2014/12/11 00:54:11]

I would appreciate more explanation here to clarify API permission vs.
Permission IDs, like: For example, a simple API permission will have x. A
complex API permission will have y. Host permissions will have z.

[sashab, 2014/12/11 04:15:36]

Good point, and the main thing to get across here is that the messages are
generated in PermissionMessageProvider. Done.

+  // by PermissionMessageProvider to generate meaningful permission messages
+  // for the app.
+  virtual PermissionIDSet GetPermissions() const = 0;
+
   // Returns true if this permission has any PermissionMessages.
+  // TODO(sashab): Deprecate this in favor of GetPermissions() above.
   virtual bool HasMessages() const = 0;
 
   // Returns the localized permission messages of this permission.
+  // TODO(sashab): Deprecate this in favor of GetPermissions() above.
   virtual PermissionMessages GetMessages() const = 0;
 
   // Returns true if the given permission is allowed.
   virtual bool Check(const CheckParam* param) const = 0;
 
   // Returns true if |rhs| is a subset of this.
   virtual bool Contains(const APIPermission* rhs) const = 0;
 
   // Returns true if |rhs| is equal to this.
   virtual bool Equal(const APIPermission* rhs) const = 0;
@@ skipping 148 matching lines @@
   const char* const name_;
   const int flags_;
   const int l10n_message_id_;
   const PermissionMessage::ID message_id_;
   const APIPermissionConstructor api_permission_constructor_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_H_