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

Unified Diff: chrome/browser/extensions/api/autotest_private/autotest_private_api.cc

Issue 315573003: Remove PermissionsData::ForExtension() completely (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/browser/extensions/api/autotest_private/autotest_private_api.cc
diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
index d31c58edd558f2c4773520162b3e8aefd38623de..d5a3fe6c66302a8d016d1b9523bfc2be975ebc97 100644
--- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
@@ -32,17 +32,16 @@ namespace extensions {
namespace {
base::ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) {
- extensions::URLPatternSet pattern_set;
- if (effective_perm) {
- pattern_set = extensions::PermissionsData::ForExtension(ext)
- ->GetEffectiveHostPermissions();
- } else {
+ URLPatternSet pattern_set;
+ if (effective_perm)
+ pattern_set = ext->permissions_data()->GetEffectiveHostPermissions();
+ else
pattern_set = ext->GetActivePermissions()->explicit_hosts();
- }
base::ListValue* permissions = new base::ListValue;
- for (extensions::URLPatternSet::const_iterator perm = pattern_set.begin();
- perm != pattern_set.end(); ++perm) {
+ for (URLPatternSet::const_iterator perm = pattern_set.begin();
+ perm != pattern_set.end();
+ ++perm) {
permissions->Append(new base::StringValue(perm->GetAsString()));
}
@@ -150,10 +149,9 @@ bool AutotestPrivateLockScreenFunction::RunSync() {
bool AutotestPrivateGetExtensionsInfoFunction::RunSync() {
DVLOG(1) << "AutotestPrivateGetExtensionsInfoFunction";
- ExtensionService* service = extensions::ExtensionSystem::Get(
- GetProfile())->extension_service();
- ExtensionRegistry* registry =
- extensions::ExtensionRegistry::Get(GetProfile());
+ ExtensionService* service =
+ ExtensionSystem::Get(GetProfile())->extension_service();
+ ExtensionRegistry* registry = ExtensionRegistry::Get(GetProfile());
const ExtensionSet& extensions = registry->enabled_extensions();
const ExtensionSet& disabled_extensions = registry->disabled_extensions();
ExtensionActionManager* extension_action_manager =
@@ -173,10 +171,10 @@ bool AutotestPrivateGetExtensionsInfoFunction::RunSync() {
extension_value->SetString("name", extension->name());
extension_value->SetString("publicKey", extension->public_key());
extension_value->SetString("description", extension->description());
- extension_value->SetString("backgroundUrl",
- extensions::BackgroundInfo::GetBackgroundURL(extension).spec());
+ extension_value->SetString(
+ "backgroundUrl", BackgroundInfo::GetBackgroundURL(extension).spec());
extension_value->SetString("optionsUrl",
- extensions::ManifestURL::GetOptionsPage(extension).spec());
+ ManifestURL::GetOptionsPage(extension).spec());
extension_value->Set("hostPermissions",
GetHostPermissions(extension, false));

Powered by Google App Engine
This is Rietveld 408576698