summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 22:51:38 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 22:51:38 +0000
commitf2780a080a4498f9f4e20abf560025aa6974a322 (patch)
tree544cb053aa82dca01490893b90641ba0ac509a18
parent330bc47ba54a8f899e8203c6d6e8b05fcd8ffcb1 (diff)
downloadchromium_src-f2780a080a4498f9f4e20abf560025aa6974a322.zip
chromium_src-f2780a080a4498f9f4e20abf560025aa6974a322.tar.gz
chromium_src-f2780a080a4498f9f4e20abf560025aa6974a322.tar.bz2
aura: Do not attempt to remove the window multiple times on detach.
The window gets removed in RemovedFromWidget, so it is not necessary to do this again in NativeViewDetaching. This fixes a couple of failing DOMViewTest tests. BUG=103487 TEST=DOMViewTest.TestRemoveAndDelete, TestReparent (browser_tests) Review URL: http://codereview.chromium.org/8574016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110198 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--views/controls/native/native_view_host_aura.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/views/controls/native/native_view_host_aura.cc b/views/controls/native/native_view_host_aura.cc
index f292331..888ece7 100644
--- a/views/controls/native/native_view_host_aura.cc
+++ b/views/controls/native/native_view_host_aura.cc
@@ -35,7 +35,6 @@ void NativeViewHostAura::NativeViewDetaching(bool destroyed) {
if (!destroyed) {
host_->native_view()->RemoveObserver(this);
host_->native_view()->Hide();
- host_->GetWidget()->GetNativeView()->RemoveChild(host_->native_view());
}
}