summaryrefslogtreecommitdiffstats
path: root/chrome/browser/devtools
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 /chrome/browser/devtools
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 'chrome/browser/devtools')
-rw-r--r--chrome/browser/devtools/devtools_ui_bindings.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
index 65dd557..ae45cdb 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.cc
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -49,6 +49,7 @@
#include "content/public/common/url_constants.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension_set.h"
+#include "extensions/common/permissions/permissions_data.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -757,10 +758,10 @@ void DevToolsUIBindings::AddDevToolsExtensionsToClient() {
extensions::ManifestURL::GetDevToolsPage(
extension->get()).spec()));
extension_info->Set("name", new base::StringValue((*extension)->name()));
- extension_info->Set(
- "exposeExperimentalAPIs",
- new base::FundamentalValue((*extension)->HasAPIPermission(
- extensions::APIPermission::kExperimental)));
+ extension_info->Set("exposeExperimentalAPIs",
+ new base::FundamentalValue(
+ (*extension)->permissions_data()->HasAPIPermission(
+ extensions::APIPermission::kExperimental)));
results.Append(extension_info);
}
CallClientFunction("WebInspector.addExtensions", &results, NULL, NULL);