chrome/browser/extensions/crx_installer.cc - Issue 15987009: Update chrome/ to use WeakPtr<T>::get() instead of implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15987009: Update chrome/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc ('k') | chrome/browser/extensions/extension_action.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/crx_installer.cc

diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc

index aa6e3eab2ec696b9b8a74e8b14933b132a037a89..b3cf07f8f6e8add37f7bc09bdba8fb59dc3e1bc8 100644

--- a/chrome/browser/extensions/crx_installer.cc

+++ b/chrome/browser/extensions/crx_installer.cc

@@ -398,7 +398,7 @@ void CrxInstaller::OnUnpackSuccess(const base::FilePath& temp_dir,

void CrxInstaller::CheckImportsAndRequirements() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- ExtensionService* service = service_weak_;

+ ExtensionService* service = service_weak_.get();

if (!service || service->browser_terminating())

return;

@@ -449,7 +449,7 @@ void CrxInstaller::OnRequirementsChecked(

void CrxInstaller::ConfirmInstall() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- ExtensionService* service = service_weak_;

+ ExtensionService* service = service_weak_.get();

if (!service || service->browser_terminating())

return;

@@ -497,7 +497,7 @@ void CrxInstaller::ConfirmInstall() {

void CrxInstaller::InstallUIProceed() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- ExtensionService* service = service_weak_;

+ ExtensionService* service = service_weak_.get();

if (!service || service->browser_terminating())

return;

@@ -658,7 +658,7 @@ void CrxInstaller::ReportSuccessFromFileThread() {

void CrxInstaller::ReportSuccessFromUIThread() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- if (!service_weak_ || service_weak_->browser_terminating())

+ if (!service_weak_.get() || service_weak_->browser_terminating())

return;

if (!update_from_settings_page_) {

@@ -756,7 +756,7 @@ void CrxInstaller::CleanupTempFiles() {

void CrxInstaller::CheckUpdateFromSettingsPage() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- ExtensionService* service = service_weak_;

+ ExtensionService* service = service_weak_.get();

if (!service || service->browser_terminating())

return;

@@ -777,7 +777,7 @@ void CrxInstaller::CheckUpdateFromSettingsPage() {

void CrxInstaller::ConfirmReEnable() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- ExtensionService* service = service_weak_;

+ ExtensionService* service = service_weak_.get();

if (!service || service->browser_terminating())

return;