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

Unified Diff: chrome/common/extensions/permissions/permission_set.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months 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/permission_set.cc
diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc
index f86ad104f697abd2930b5f549dce76778640d200..e4bd028f1d937275cc1007deed817bf6ce1cf99e 100644
--- a/chrome/common/extensions/permissions/permission_set.cc
+++ b/chrome/common/extensions/permissions/permission_set.cc
@@ -268,7 +268,7 @@ std::set<std::string>
}
PermissionMessages PermissionSet::GetPermissionMessages(
- Extension::Type extension_type) const {
+ Manifest::Type extension_type) const {
PermissionMessages messages;
if (HasEffectiveFullAccess()) {
@@ -280,7 +280,7 @@ PermissionMessages PermissionSet::GetPermissionMessages(
// Since platform apps always use isolated storage, they can't (silently)
// access user data on other domains, so there's no need to prompt.
- if (extension_type != Extension::TYPE_PLATFORM_APP) {
+ if (extension_type != Manifest::TYPE_PLATFORM_APP) {
if (HasEffectiveAccessToAllHosts()) {
messages.push_back(PermissionMessage(
PermissionMessage::kHostsAll,
@@ -300,7 +300,7 @@ PermissionMessages PermissionSet::GetPermissionMessages(
}
std::vector<string16> PermissionSet::GetWarningMessages(
- Extension::Type extension_type) const {
+ Manifest::Type extension_type) const {
std::vector<string16> messages;
PermissionMessages permissions = GetPermissionMessages(extension_type);
« no previous file with comments | « chrome/common/extensions/permissions/permission_set.h ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698