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

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

Issue 508513002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Two more Created 6 years, 4 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/installed_loader.cc
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index 363c7d3d8e31ca58070080fca7cc73485e676b4b..71fc70ef12cff1997e72f12ef75e3d519bdd9a1c 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -202,7 +202,8 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) {
error = errors::kDisabledByPolicy;
extension = NULL;
} else if (!extension_prefs_->IsExtensionDisabled(extension->id()) &&
- policy->MustRemainDisabled(extension, &disable_reason, NULL)) {
+ policy->MustRemainDisabled(
+ extension.get(), &disable_reason, NULL)) {
extension_prefs_->SetExtensionState(extension->id(), Extension::DISABLED);
extension_prefs_->AddDisableReason(extension->id(), disable_reason);
force_disabled = true;
@@ -330,7 +331,7 @@ void InstalledLoader::LoadAllExtensions() {
for (ExtensionSet::const_iterator iter = extensions.begin();
iter != extensions.end();
++iter) {
- const Extension* extension = *iter;
+ const Extension* extension = iter->get();
Manifest::Location location = extension->location();
Manifest::Type type = extension->GetType();
@@ -498,7 +499,7 @@ void InstalledLoader::LoadAllExtensions() {
RecordDisableReasons(extension_prefs_->GetDisableReasons((*ex)->id()));
if (Manifest::IsExternalLocation((*ex)->location())) {
// See loop above for ENABLED.
- if (ManifestURL::UpdatesFromGallery(*ex)) {
+ if (ManifestURL::UpdatesFromGallery(ex->get())) {
UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState",
EXTERNAL_ITEM_WEBSTORE_DISABLED,
EXTERNAL_ITEM_MAX_ITEMS);

Powered by Google App Engine
This is Rietveld 408576698