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

Unified Diff: chrome/common/extensions/extension_permission_set.cc

Issue 10065040: RefCounted types should not have public destructors, chrome/ remaining parts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Implementation fixes Created 8 years, 8 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/common/extensions/extension_permission_set.cc
diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc
index 8b882c795b4882eb6dd06117a052ae988c6d9640..fe6a08bdc6a499f183031443486faa058ed7fbdf 100644
--- a/chrome/common/extensions/extension_permission_set.cc
+++ b/chrome/common/extensions/extension_permission_set.cc
@@ -145,13 +145,14 @@ ExtensionPermissionMessage::ExtensionPermissionMessage(
: id_(id), message_(message) {
}
-ExtensionPermissionMessage::~ExtensionPermissionMessage() {
-}
+ExtensionPermissionMessage::~ExtensionPermissionMessage() {}
//
// ExtensionPermission
//
+ExtensionAPIPermission::~ExtensionAPIPermission() {}
+
ExtensionPermissionMessage ExtensionAPIPermission::GetMessage() const {
return ExtensionPermissionMessage(
message_id_, l10n_util::GetStringUTF16(l10n_message_id_));
@@ -169,8 +170,6 @@ ExtensionAPIPermission::ExtensionAPIPermission(
l10n_message_id_(l10n_message_id),
message_id_(message_id) {}
-ExtensionAPIPermission::~ExtensionAPIPermission() {}
-
// static
void ExtensionAPIPermission::RegisterAllPermissions(
ExtensionPermissionsInfo* info) {
@@ -405,7 +404,8 @@ ExtensionPermissionsInfo::ExtensionPermissionsInfo()
}
void ExtensionPermissionsInfo::RegisterAlias(
- const char* name, const char* alias) {
+ const char* name,
Nico 2012/04/25 13:20:37 ?
Ryan Sleevi 2012/04/25 15:13:59 Style guide. Only two forms: all on one line or on
+ const char* alias) {
DCHECK(name_map_.find(name) != name_map_.end());
DCHECK(name_map_.find(alias) == name_map_.end());
name_map_[alias] = name_map_[name];
@@ -435,8 +435,7 @@ ExtensionAPIPermission* ExtensionPermissionsInfo::RegisterPermission(
// ExtensionPermissionSet
//
-ExtensionPermissionSet::ExtensionPermissionSet() {
-}
+ExtensionPermissionSet::ExtensionPermissionSet() {}
ExtensionPermissionSet::ExtensionPermissionSet(
const Extension* extension,
@@ -479,8 +478,6 @@ ExtensionPermissionSet::ExtensionPermissionSet(
InitEffectiveHosts();
}
-ExtensionPermissionSet::~ExtensionPermissionSet() {}
Nico 2012/04/25 13:20:37 Wasn't the consensus on that thread to keep constr
Ryan Sleevi 2012/04/25 15:13:59 No, it was "the style guide says X so we do X, no
-
// static
ExtensionPermissionSet* ExtensionPermissionSet::CreateDifference(
const ExtensionPermissionSet* set1,
@@ -801,6 +798,8 @@ bool ExtensionPermissionSet::HasLessPrivilegesThan(
return false;
}
+ExtensionPermissionSet::~ExtensionPermissionSet() {}
+
// static
std::set<std::string> ExtensionPermissionSet::GetDistinctHosts(
const URLPatternSet& host_patterns,
@@ -855,13 +854,6 @@ std::set<std::string> ExtensionPermissionSet::GetDistinctHosts(
return distinct_hosts;
}
-void ExtensionPermissionSet::InitEffectiveHosts() {
- effective_hosts_.ClearPatterns();
-
- URLPatternSet::CreateUnion(
- explicit_hosts(), scriptable_hosts(), &effective_hosts_);
-}
-
void ExtensionPermissionSet::InitImplicitExtensionPermissions(
const Extension* extension) {
// Add the implied permissions.
@@ -882,6 +874,13 @@ void ExtensionPermissionSet::InitImplicitExtensionPermissions(
}
}
+void ExtensionPermissionSet::InitEffectiveHosts() {
+ effective_hosts_.ClearPatterns();
+
+ URLPatternSet::CreateUnion(
+ explicit_hosts(), scriptable_hosts(), &effective_hosts_);
+}
+
std::set<ExtensionPermissionMessage>
ExtensionPermissionSet::GetSimplePermissionMessages() const {
std::set<ExtensionPermissionMessage> messages;

Powered by Google App Engine
This is Rietveld 408576698