chrome/common/extensions/permissions/permission_set.h - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

« chrome/common/extensions/manifest.cc ('K') | « chrome/common/extensions/manifest_url_handler.cc ('k') | chrome/common/extensions/permissions/permission_set.cc » ('j') | extensions/common/install_warning.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/permission_set.h

diff --git a/chrome/common/extensions/permissions/permission_set.h b/chrome/common/extensions/permissions/permission_set.h

index 6c5288768f9a7c5938b51e23aa1ed4b517eea770..056640668edd67ed6b081688c430d6fc0d6a7fcc 100644

--- a/chrome/common/extensions/permissions/permission_set.h

+++ b/chrome/common/extensions/permissions/permission_set.h

@@ -15,6 +15,7 @@

#include "base/memory/singleton.h"

#include "base/string16.h"

#include "chrome/common/extensions/extension.h"

+#include "chrome/common/extensions/manifest.h"

#include "chrome/common/extensions/permissions/api_permission.h"

#include "chrome/common/extensions/permissions/api_permission_set.h"

#include "chrome/common/extensions/permissions/permission_message.h"

@@ -80,12 +81,12 @@ class PermissionSet

// Gets the localized permission messages that represent this set.

// The set of permission messages shown varies by extension type.

- PermissionMessages GetPermissionMessages(Extension::Type extension_type)

+ PermissionMessages GetPermissionMessages(Manifest::Type extension_type)

const;

// Gets the localized permission messages that represent this set (represented

// as strings). The set of permission messages shown varies by extension type.

- std::vector<string16> GetWarningMessages(Extension::Type extension_type)

+ std::vector<string16> GetWarningMessages(Manifest::Type extension_type)

const;

// Returns true if this is an empty set (e.g., the default permission set).