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

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 214083004: Prevents crash when a menu gets closed during drag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevents crash when a menu gets closed during drag (typo) Created 6 years, 9 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
« ui/views/controls/menu/menu_host.cc ('K') | « ui/views/controls/menu/menu_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index e619661efa63c444714b97c15e8dcfdca1ede312..38339468c2d8909bc7b0018eacb83d38c9ad186c 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -591,6 +591,8 @@ void DesktopNativeWidgetAura::ReorderNativeViews() {
}
void DesktopNativeWidgetAura::ViewRemoved(View* view) {
+ DCHECK(drop_helper_.get() != NULL);
+ drop_helper_->ResetTargetViewIfEquals(view);
varkha 2014/03/27 20:30:28 This is same as the code in NativeWidgetAura::View
}
void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name,
« ui/views/controls/menu/menu_host.cc ('K') | « ui/views/controls/menu/menu_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698