chrome/browser/ui/views/toolbar/toolbar_action_view.cc - Issue 1494433003: Fixes a crash when InkDropDelegate gets destroyed after its InkDropHost

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/views/toolbar/toolbar_action_view.cc

Issue 1494433003: Fixes a crash when InkDropDelegate gets destroyed after its InkDropHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixes a crash when InkDropDelegate gets destroyed after its InkDropHost (corrections and test) Created 5 years 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/ui/views/toolbar/toolbar_action_view.cc

diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

index 524fb9525cedfeabefa855b52dad6f68772f4f7d..b23c1028307fc9899f1e5f6f83c2a075a6ac0265 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

@@ -109,6 +109,7 @@ ToolbarActionView::~ToolbarActionView() {

if (context_menu_owner == this)

context_menu_owner = nullptr;

view_controller_->SetDelegate(nullptr);

+ SetInkDropDelegate(scoped_ptr<views::InkDropDelegate>());

}

void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) {

« no previous file with comments | « no previous file | ui/views/animation/ink_drop_delegate_unittest.cc » ('j') | ui/views/animation/ink_drop_delegate_unittest.cc » ('J')