base/observer_list.h - Issue 15836004: Update base/ 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: base/observer_list.h

Issue 15836004: Update base/ 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, 7 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: base/observer_list.h

diff --git a/base/observer_list.h b/base/observer_list.h

index 364b180118ffbec8fc57566406734cc6ece24030..20f183d9cc543821ef4e393b0f813d3782059834 100644

--- a/base/observer_list.h

+++ b/base/observer_list.h

@@ -89,12 +89,12 @@ class ObserverListBase

}

~Iterator() {

- if (list_ && --list_->notify_depth_ == 0)

+ if (list_.get() && --list_->notify_depth_ == 0)

list_->Compact();

}

ObserverType* GetNext() {

- if (!list_)

+ if (!list_.get())

return NULL;

ListType& observers = list_->observers_;

// Advance if the current element is null

« base/bind_internal.h.pump ('K') | « base/bind_internal.h.pump ('k') | no next file » | no next file with comments »