diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 12:10:31 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 12:10:31 +0000 |
| commit | 4442454ffb06c14fbfae4221acbd1e6313011540 (patch) | |
| tree | 0a59ac7e9b6f3c7a58b2a511f19bcc460a521e55 /extensions | |
| parent | 290ed47446dcf19e50e1b69f09f1e17ec1017fc4 (diff) | |
| download | chromium_src-4442454ffb06c14fbfae4221acbd1e6313011540.zip chromium_src-4442454ffb06c14fbfae4221acbd1e6313011540.tar.gz chromium_src-4442454ffb06c14fbfae4221acbd1e6313011540.tar.bz2 | |
Cleanup: Fix some lint/style errors in extensions code.
Review URL: https://codereview.chromium.org/149213003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/extension_prefs.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc index a2e1e87..8c26aa3 100644 --- a/extensions/browser/extension_prefs.cc +++ b/extensions/browser/extension_prefs.cc @@ -869,7 +869,6 @@ void ExtensionPrefs::MigratePermissions(const ExtensionIdList& extension_ids) { PermissionsInfo* info = PermissionsInfo::GetInstance(); for (ExtensionIdList::const_iterator ext_id = extension_ids.begin(); ext_id != extension_ids.end(); ++ext_id) { - // An extension's granted permissions need to be migrated if the // full_access bit is present. This bit was always present in the previous // scheme and is never present now. @@ -887,15 +886,13 @@ void ExtensionPrefs::MigratePermissions(const ExtensionIdList& extension_ids) { const base::ListValue* apis = NULL; base::ListValue* new_apis = NULL; - std::string granted_apis = - JoinPrefs(kPrefGrantedPermissions, kPrefAPIs); + std::string granted_apis = JoinPrefs(kPrefGrantedPermissions, kPrefAPIs); if (ext->GetList(kPrefOldGrantedAPIs, &apis)) new_apis = apis->DeepCopy(); else new_apis = new base::ListValue(); - std::string plugin_name = info->GetByID( - APIPermission::kPlugin)->name(); + std::string plugin_name = info->GetByID(APIPermission::kPlugin)->name(); new_apis->Append(new base::StringValue(plugin_name)); UpdateExtensionPref(*ext_id, granted_apis, new_apis); } @@ -1671,7 +1668,7 @@ void ExtensionPrefs::SetGeometryCache( } const base::DictionaryValue* ExtensionPrefs::GetInstallSignature() { - return prefs_->GetDictionary(kInstallSignature); + return prefs_->GetDictionary(kInstallSignature); } void ExtensionPrefs::SetInstallSignature( |