summaryrefslogtreecommitdiffstats
path: root/extensions/common/extension.cc
diff options
context:
space:
mode:
authorrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 21:47:26 +0000
committerrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 21:47:26 +0000
commit076ebedaa781461c668ea435ef3af3ca707775d5 (patch)
tree5189adac73248df281db674fff5ce4c08dda0ce8 /extensions/common/extension.cc
parent4bd4064aede02bd5ae1c0a4b7a01af4830abb47a (diff)
downloadchromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.zip
chromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.tar.gz
chromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.tar.bz2
Remove deprecated permissions functions from Extension
The methods GetActivePermission() and HasAPIPermission() have been deprecated for more than a year. Finally remove them. Also clean up some includes in extension.h, and fix transitive includes. BUG=379356 TBR=atwilson@chromium.org (c/b/background) TBR=yurys@chromium.org (c/b/devtools) TBR=bauerb@chromium.org (c/b/managed_mode) TBR=dalecurtis@chromium.org (c/b/media) TBR=dewittj@chromium.org (c/b/notifications) TBR=msw@chromium.org (c/b/ui) All TBRs are for strictly mechanical changes - no functional difference. Review URL: https://codereview.chromium.org/314113010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/common/extension.cc')
-rw-r--r--extensions/common/extension.cc15
1 files changed, 1 insertions, 14 deletions
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index 9179d46..8fab82b 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -28,12 +28,11 @@
#include "extensions/common/manifest_constants.h"
#include "extensions/common/manifest_handler.h"
#include "extensions/common/manifest_handlers/permissions_parser.h"
-#include "extensions/common/permissions/api_permission_set.h"
#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_data.h"
#include "extensions/common/permissions/permissions_info.h"
#include "extensions/common/switches.h"
-#include "extensions/common/url_pattern_set.h"
+#include "extensions/common/url_pattern.h"
#include "net/base/filename_util.h"
#include "url/url_util.h"
@@ -287,18 +286,6 @@ GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
url::kStandardSchemeSeparator + extension_id + "/");
}
-bool Extension::HasAPIPermission(APIPermission::ID permission) const {
- return permissions_data_->HasAPIPermission(permission);
-}
-
-bool Extension::HasAPIPermission(const std::string& permission_name) const {
- return permissions_data_->HasAPIPermission(permission_name);
-}
-
-scoped_refptr<const PermissionSet> Extension::GetActivePermissions() const {
- return permissions_data_->active_permissions();
-}
-
bool Extension::ShowConfigureContextMenus() const {
// Don't show context menu for component extensions. We might want to show
// options for component extension button but now there is no component