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

Unified Diff: chrome/browser/extensions/webstore_standalone_installer.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
« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/webstore_standalone_installer.cc
diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc
index dc9ea0efdf251a5aa54c0c03d6b66805291d7973..dd2ac5ccfd233b630ba2963374373d272541be59 100644
--- a/chrome/browser/extensions/webstore_standalone_installer.cc
+++ b/chrome/browser/extensions/webstore_standalone_installer.cc
@@ -132,7 +132,7 @@ void WebstoreStandaloneInstaller::CompleteInstall(
void WebstoreStandaloneInstaller::ProceedWithInstallPrompt() {
install_prompt_ = CreateInstallPrompt();
- if (install_prompt_) {
+ if (install_prompt_.get()) {
ShowInstallUI();
// Control flow finishes up in InstallUIProceed or InstallUIAbort.
} else {
@@ -349,7 +349,8 @@ void WebstoreStandaloneInstaller::InstallUIProceed() {
// If the target extension has already been installed ephemerally and is
// up to date, it can be promoted to a regular installed extension and
// downloading from the Web Store is not necessary.
- const Extension* extension_to_install = GetLocalizedExtensionForDisplay();
+ scoped_refptr<const Extension> extension_to_install =
dcheng 2014/08/26 01:30:17 Note: I missed this in my original overview of the
+ GetLocalizedExtensionForDisplay();
if (!extension_to_install) {
CompleteInstall(webstore_install::INVALID_MANIFEST,
kInvalidManifestError);
@@ -421,7 +422,8 @@ void WebstoreStandaloneInstaller::OnExtensionInstallFailure(
}
void WebstoreStandaloneInstaller::ShowInstallUI() {
- const Extension* localized_extension = GetLocalizedExtensionForDisplay();
+ scoped_refptr<const Extension> localized_extension =
+ GetLocalizedExtensionForDisplay();
if (!localized_extension) {
CompleteInstall(webstore_install::INVALID_MANIFEST, kInvalidManifestError);
return;
« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698