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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 17948002: Update Linux to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 8448b6addd044feb3c267f1608d706d6fe35c1dc..a3e7a66d4a834972c97b402d5a56a614c8eba690 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -835,7 +835,7 @@ bool ExtensionService::UninstallExtension(
delayed_installs_.Remove(extension_id);
- PruneSharedModulesOnUninstall(extension);
+ PruneSharedModulesOnUninstall(extension.get());
// Track the uninstallation.
UMA_HISTOGRAM_ENUMERATION("Extensions.ExtensionUninstalled", 1, 2);
@@ -959,12 +959,12 @@ void ExtensionService::DisableUserExtensions() {
for (ExtensionSet::const_iterator extension = extensions_.begin();
extension != extensions_.end(); ++extension) {
- if (management_policy->UserMayModifySettings(*extension, NULL))
+ if (management_policy->UserMayModifySettings(extension->get(), NULL))
to_disable.push_back(*extension);
}
for (ExtensionSet::const_iterator extension = terminated_extensions_.begin();
extension != terminated_extensions_.end(); ++extension) {
- if (management_policy->UserMayModifySettings(*extension, NULL))
+ if (management_policy->UserMayModifySettings(extension->get(), NULL))
to_disable.push_back(*extension);
}
@@ -2261,7 +2261,8 @@ scoped_ptr<const ExtensionSet>
set_to_check->InsertAll(extensions_);
for (ExtensionSet::const_iterator iter = set_to_check->begin();
iter != set_to_check->end(); ++iter) {
- if (SharedModuleInfo::ImportsExtensionById(*iter, extension->id())) {
+ if (SharedModuleInfo::ImportsExtensionById(iter->get(),
+ extension->id())) {
dependents->Insert(*iter);
}
}
« no previous file with comments | « chrome/browser/extensions/api/storage/settings_apitest.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698