diff options
| author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 19:02:52 +0000 |
|---|---|---|
| committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 19:02:52 +0000 |
| commit | 0d3e4a22b373147c6144b57fefdf4012823e9150 (patch) | |
| tree | 6388b5763a9c434ba6c79daff407b0e4e11d3572 /chrome/renderer | |
| parent | e31440ac4b5ff347768ade5e2cd6e42720234ca0 (diff) | |
| download | chromium_src-0d3e4a22b373147c6144b57fefdf4012823e9150.zip chromium_src-0d3e4a22b373147c6144b57fefdf4012823e9150.tar.gz chromium_src-0d3e4a22b373147c6144b57fefdf4012823e9150.tar.bz2 | |
Start refractoring extension permissions into ExtensionPermissionSet.
BUG=84507
TEST=*Extension*
Review URL: http://codereview.chromium.org/7003098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/extensions/bindings_utils.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/extensions/extension_dispatcher.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc index 89fa70b..0d786e7 100644 --- a/chrome/renderer/extensions/bindings_utils.cc +++ b/chrome/renderer/extensions/bindings_utils.cc @@ -65,7 +65,7 @@ bool ExtensionBase::CheckPermissionForCurrentContext( const ::Extension* extension = GetExtensionForCurrentContext(); if (extension && extension_dispatcher_->IsExtensionActive(extension->id()) && - extension->HasApiPermission(function_name)) + extension->HasAPIPermission(function_name)) return true; static const char kMessage[] = diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc index 370f36d..e654623 100644 --- a/chrome/renderer/extensions/extension_dispatcher.cc +++ b/chrome/renderer/extensions/extension_dispatcher.cc @@ -235,7 +235,7 @@ void ExtensionDispatcher::OnActivateExtension( } void ExtensionDispatcher::InitHostPermissions(const Extension* extension) { - if (extension->HasApiPermission(Extension::kManagementPermission)) { + if (extension->HasAPIPermission(ExtensionAPIPermission::kManagement)) { WebSecurityPolicy::addOriginAccessWhitelistEntry( extension->url(), WebString::fromUTF8(chrome::kChromeUIScheme), @@ -243,7 +243,8 @@ void ExtensionDispatcher::InitHostPermissions(const Extension* extension) { false); } - const URLPatternList& permissions = extension->host_permissions(); + const URLPatternList& permissions = + extension->permission_set()->explicit_hosts().patterns(); for (size_t i = 0; i < permissions.size(); ++i) { const char* schemes[] = { chrome::kHttpScheme, |