Index: chrome/browser/media_galleries/media_galleries_preferences.cc |
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc |
index 723b65e2f816b6c4f69b4f8585789b938e5a8505..e8415cba3b448048fed60e49a8d11550c7cc8197 100644 |
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc |
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc |
@@ -96,10 +96,10 @@ int NumberExtensionsUsingMediaGalleries(Profile* profile) { |
const extensions::ExtensionSet* extensions = extension_service->extensions(); |
for (extensions::ExtensionSet::const_iterator i = extensions->begin(); |
i != extensions->end(); ++i) { |
- if (extensions::PermissionsData::HasAPIPermission( |
- *i, extensions::APIPermission::kMediaGalleries) || |
- extensions::PermissionsData::HasAPIPermission( |
- *i, extensions::APIPermission::kMediaGalleriesPrivate)) { |
+ if (extensions::PermissionsData::ForExtension(*i) |
Lei Zhang
2014/06/02 22:40:31
I'm only looking at the media galleries bits.
Her
Devlin
2014/06/03 15:28:21
Happy to do both. As Kalman points out, git cl fo
|
+ ->HasAPIPermission(extensions::APIPermission::kMediaGalleries) || |
+ extensions::PermissionsData::ForExtension(*i)->HasAPIPermission( |
+ extensions::APIPermission::kMediaGalleriesPrivate)) { |
count++; |
} |
} |
@@ -277,8 +277,9 @@ base::DictionaryValue* CreateGalleryPrefInfoDictionary( |
bool HasAutoDetectedGalleryPermission(const extensions::Extension& extension) { |
extensions::MediaGalleriesPermission::CheckParam param( |
extensions::MediaGalleriesPermission::kAllAutoDetectedPermission); |
- return extensions::PermissionsData::CheckAPIPermissionWithParam( |
- &extension, extensions::APIPermission::kMediaGalleries, ¶m); |
+ return extensions::PermissionsData::ForExtension(&extension) |
+ ->CheckAPIPermissionWithParam(extensions::APIPermission::kMediaGalleries, |
+ ¶m); |
} |
// Retrieves the MediaGalleryPermission from the given dictionary; DCHECKs on |