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

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 (restore to PS3) 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
« no previous file with comments | « no previous file | ui/views/animation/ink_drop_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>());
Devlin 2015/12/08 16:56:37 Would it be better to move this to the CustomButto
varkha 2015/12/08 17:09:15 Would be nice but this is exactly what this CL is
Devlin 2015/12/08 17:33:39 Ah, gotcha. Well, that's disappointing. So, let'
varkha 2015/12/08 19:00:50 Yeah, I've tried it before and initially rejected
Devlin 2015/12/08 19:44:06 My hope was that if ToolbarActionView owns the Ink
}
void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) {
« no previous file with comments | « no previous file | ui/views/animation/ink_drop_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698