summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_prefs.cc
diff options
context:
space:
mode:
authorpenghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 13:02:15 +0000
committerpenghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 13:02:15 +0000
commitecb9ad1bad6b9261c4e11ca70d035eef83e3e6f4 (patch)
treeba6cd8ab4857860a61c76346d2b1a910b8a1a7c8 /chrome/browser/extensions/extension_prefs.cc
parent4ee07c648c466ba555dba96f76455a5c53007385 (diff)
downloadchromium_src-ecb9ad1bad6b9261c4e11ca70d035eef83e3e6f4.zip
chromium_src-ecb9ad1bad6b9261c4e11ca70d035eef83e3e6f4.tar.gz
chromium_src-ecb9ad1bad6b9261c4e11ca70d035eef83e3e6f4.tar.bz2
Rename APIPermission to APIPermissionInfo and APIPermissionDetail to APIPermission
BUG=130222 TEST=unit_tests Review URL: https://chromiumcodereview.appspot.com/10837309 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_prefs.cc')
-rw-r--r--chrome/browser/extensions/extension_prefs.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 4b8a442..f6692fb 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -505,18 +505,20 @@ PermissionSet* ExtensionPrefs::ReadExtensionPrefPermissionSet(
permission_detail = &it.value();
}
- APIPermission *permission = info->GetByName(permission_name);
- if (!permission) {
+ const APIPermissionInfo *permission_info =
+ info->GetByName(permission_name);
+ if (!permission_info) {
NOTREACHED() << "Unknown permission[" << permission_name << "].";
continue;
}
- scoped_refptr<APIPermissionDetail> detail = permission->CreateDetail();
- if (!detail->FromValue(permission_detail)) {
- NOTREACHED() << "Parse permission detail failed.";
+ scoped_refptr<APIPermission> permission =
+ permission_info->CreateAPIPermission();
+ if (!permission->FromValue(permission_detail)) {
+ NOTREACHED() << "Parse permission failed.";
continue;
}
- apis.insert(detail);
+ apis.insert(permission);
}
}