chrome/browser/ui/autofill/autofill_popup_controller_impl.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/ui/autofill/autofill_popup_controller_impl.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, 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

« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc ('k') | chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

index cdfaea1850c0f54213457166c3fb79f48abb3666..b4fcaf7b7d469cbd561849e1de3c7411c1115446 100644

--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

@@ -73,16 +73,15 @@ WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(

WeakPtr<AutofillPopupDelegate> delegate,

gfx::NativeView container_view,

const gfx::RectF& element_bounds) {

- DCHECK(!previous || previous->delegate_ == delegate);

+ DCHECK(!previous.get() || previous->delegate_.get() == delegate.get());

- if (previous &&

- previous->container_view() == container_view &&

+ if (previous.get() && previous->container_view() == container_view &&

previous->element_bounds() == element_bounds) {

previous->ClearState();

return previous;

}

- if (previous)

+ if (previous.get())

previous->Hide();

AutofillPopupControllerImpl* controller =

@@ -169,7 +168,7 @@ void AutofillPopupControllerImpl::Show(

}

void AutofillPopupControllerImpl::Hide() {

- if (delegate_)

+ if (delegate_.get())

delegate_->OnPopupHidden(this);

if (view_)