Index: chrome/common/extensions/extension_messages.cc |
diff --git a/chrome/common/extensions/extension_messages.cc b/chrome/common/extensions/extension_messages.cc |
index 829309700c993198afc67ebc8cb82b71a6eda109..4e6905e1ef911e93bb310d9b676fa7b03ee9659d 100644 |
--- a/chrome/common/extensions/extension_messages.cc |
+++ b/chrome/common/extensions/extension_messages.cc |
@@ -9,7 +9,9 @@ |
#include "chrome/common/extensions/manifest.h" |
#include "content/public/common/common_param_traits.h" |
+using extensions::APIPermission; |
using extensions::Extension; |
+using extensions::PermissionSet; |
ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params() |
: location(Extension::INVALID), |
@@ -42,7 +44,7 @@ scoped_refptr<Extension> |
} |
extension->SetActivePermissions( |
- new ExtensionPermissionSet(apis, explicit_hosts, scriptable_hosts)); |
+ new PermissionSet(apis, explicit_hosts, scriptable_hosts)); |
return extension; |
} |
@@ -118,22 +120,22 @@ void ParamTraits<URLPatternSet>::Log(const param_type& p, std::string* l) { |
LogParam(p.patterns(), l); |
} |
-void ParamTraits<ExtensionAPIPermission::ID>::Write( |
+void ParamTraits<APIPermission::ID>::Write( |
Message* m, const param_type& p) { |
WriteParam(m, static_cast<int>(p)); |
} |
-bool ParamTraits<ExtensionAPIPermission::ID>::Read( |
+bool ParamTraits<APIPermission::ID>::Read( |
const Message* m, PickleIterator* iter, param_type* p) { |
int api_id = -2; |
if (!ReadParam(m, iter, &api_id)) |
return false; |
- *p = static_cast<ExtensionAPIPermission::ID>(api_id); |
+ *p = static_cast<APIPermission::ID>(api_id); |
return true; |
} |
-void ParamTraits<ExtensionAPIPermission::ID>::Log( |
+void ParamTraits<APIPermission::ID>::Log( |
const param_type& p, std::string* l) { |
LogParam(static_cast<int>(p), l); |
} |