Index: chrome/common/extensions/extension_messages.h |
diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h |
index 9745bf225eb5888ad2271d259ff0ad5749a22be8..7608a6a6a07eca03854e40f4f45d7f742d6afddb 100644 |
--- a/chrome/common/extensions/extension_messages.h |
+++ b/chrome/common/extensions/extension_messages.h |
@@ -8,7 +8,7 @@ |
#include "base/shared_memory.h" |
#include "base/values.h" |
#include "chrome/common/extensions/extension.h" |
-#include "chrome/common/extensions/extension_permission_set.h" |
+#include "chrome/common/extensions/permissions/permission_set.h" |
#include "chrome/common/extensions/url_pattern.h" |
#include "chrome/common/extensions/url_pattern_set.h" |
#include "chrome/common/view_type.h" |
@@ -16,6 +16,9 @@ |
#include "content/public/common/common_param_traits.h" |
#include "ipc/ipc_message_macros.h" |
+using extensions::APIPermission; |
+using extensions::APIPermissionSet; |
+ |
#define IPC_MESSAGE_START ExtensionMsgStart |
IPC_ENUM_TRAITS(chrome::ViewType) |
@@ -122,7 +125,7 @@ struct ExtensionMsg_Loaded_Params { |
FilePath path; |
// The extension's active permissions. |
- ExtensionAPIPermissionSet apis; |
+ APIPermissionSet apis; |
URLPatternSet explicit_hosts; |
URLPatternSet scriptable_hosts; |
@@ -152,8 +155,8 @@ struct ParamTraits<URLPatternSet> { |
}; |
template <> |
-struct ParamTraits<ExtensionAPIPermission::ID> { |
- typedef ExtensionAPIPermission::ID param_type; |
+struct ParamTraits<APIPermission::ID> { |
+ typedef APIPermission::ID param_type; |
static void Write(Message* m, const param_type& p); |
static bool Read(const Message* m, PickleIterator* iter, param_type* p); |
static void Log(const param_type& p, std::string* l); |
@@ -247,7 +250,7 @@ IPC_MESSAGE_ROUTED1(ExtensionMsg_SetTabId, |
IPC_MESSAGE_CONTROL5(ExtensionMsg_UpdatePermissions, |
int /* UpdateExtensionPermissionsInfo::REASON */, |
std::string /* extension_id */, |
- ExtensionAPIPermissionSet /* permissions */, |
+ APIPermissionSet /* permissions */, |
URLPatternSet /* explicit_hosts */, |
URLPatternSet /* scriptable_hosts */) |