| Index: extensions/common/permissions/manifest_permission_set.h
|
| diff --git a/extensions/common/permissions/manifest_permission_set.h b/extensions/common/permissions/manifest_permission_set.h
|
| index e9683bc7e9d807e80c1e7b7e0a3bc3323dcf9020..4b1ffe02389ecf4010138f478b2974d26cf6de19 100644
|
| --- a/extensions/common/permissions/manifest_permission_set.h
|
| +++ b/extensions/common/permissions/manifest_permission_set.h
|
| @@ -38,7 +38,7 @@ class ManifestPermissionSet : public BaseSetOperators<ManifestPermissionSet> {
|
| static bool ParseFromJSON(
|
| const base::ListValue* permissions,
|
| ManifestPermissionSet* manifest_permissions,
|
| - string16* error,
|
| + base::string16* error,
|
| std::vector<std::string>* unhandled_permissions);
|
| };
|
|
|
|
|