ui/views/controls/native/native_view_host_aura.cc - Issue 10910034: Attempt 2 at: Fixes crash that occured because NativeViewHostAura::Detach was not

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: ui/views/controls/native/native_view_host_aura.cc

Issue 10910034: Attempt 2 at: Fixes crash that occured because NativeViewHostAura::Detach was not (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: da fix Created 8 years, 4 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: ui/views/controls/native/native_view_host_aura.cc

diff --git a/ui/views/controls/native/native_view_host_aura.cc b/ui/views/controls/native/native_view_host_aura.cc

index 81983112835ab9846685eb0c778325b485f03ec1..cfebcb3b7ec7c0ecb0c750301515aabe5eca1a61 100644

--- a/ui/views/controls/native/native_view_host_aura.cc

+++ b/ui/views/controls/native/native_view_host_aura.cc

@@ -35,6 +35,8 @@ void NativeViewHostAura::NativeViewDetaching(bool destroyed) {

if (!destroyed) {

host_->native_view()->RemoveObserver(this);

host_->native_view()->Hide();

+ if (host_->native_view()->parent())

+ host_->native_view()->parent()->RemoveChild(host_->native_view());

}

« no previous file with comments | « ui/views/controls/native/native_view_host.cc ('k') | ui/views/controls/native/native_view_host_win.h » ('j') | no next file with comments »