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

Unified Diff: chrome/browser/apps/drive/drive_app_converter.cc

Issue 507483003: Remove implicit conversions from scoped_refptr to T* in chrome/browser/apps/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error and propagate rewrites 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/apps/drive/drive_app_converter.cc
diff --git a/chrome/browser/apps/drive/drive_app_converter.cc b/chrome/browser/apps/drive/drive_app_converter.cc
index 592622d0d8ffd69f00ef371e8056299a1731e329..fb7416790927aa6db32957fb22dedefb058ba71f 100644
--- a/chrome/browser/apps/drive/drive_app_converter.cc
+++ b/chrome/browser/apps/drive/drive_app_converter.cc
@@ -150,11 +150,11 @@ void DriveAppConverter::Start() {
}
bool DriveAppConverter::IsStarted() const {
- return !fetchers_.empty() || crx_installer_;
+ return !fetchers_.empty() || crx_installer_.get();
}
bool DriveAppConverter::IsInstalling(const std::string& app_id) const {
- return crx_installer_ && crx_installer_->extension() &&
+ return crx_installer_.get() && crx_installer_->extension() &&
crx_installer_->extension()->id() == app_id;
}
@@ -176,7 +176,7 @@ void DriveAppConverter::OnIconFetchComplete(const IconFetcher* fetcher) {
}
void DriveAppConverter::StartInstall() {
- DCHECK(!crx_installer_);
+ DCHECK(!crx_installer_.get());
crx_installer_ = extensions::CrxInstaller::CreateSilent(
extensions::ExtensionSystem::Get(profile_)->extension_service());
// The converted url app should not be syncable. Drive apps go with the user's
@@ -190,7 +190,7 @@ void DriveAppConverter::StartInstall() {
}
void DriveAppConverter::PostInstallCleanUp() {
- if (!crx_installer_)
+ if (!crx_installer_.get())
return;
extensions::InstallTracker::Get(profile_)->RemoveObserver(this);
« no previous file with comments | « chrome/browser/apps/app_view_browsertest.cc ('k') | chrome/browser/apps/drive/drive_app_converter_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698