From 22dc5ff3ebf33f9e9a40e0f71939fd274e13972b Mon Sep 17 00:00:00 2001 From: Mitsuru Oshima Date: Fri, 24 Oct 2014 17:20:07 -0700 Subject: Revert the if -> DCHECK change This is called when window for web contents gets added to the activity window, so this must be if not dcheck. BUG=427003 R=mukai@chromium.org Review URL: https://codereview.chromium.org/678833002 Cr-Commit-Position: refs/heads/master@{#301241} --- athena/wm/window_list_provider_impl.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/athena/wm/window_list_provider_impl.cc b/athena/wm/window_list_provider_impl.cc index 74b0a9b..cfcb7eb 100644 --- a/athena/wm/window_list_provider_impl.cc +++ b/athena/wm/window_list_provider_impl.cc @@ -97,8 +97,7 @@ void WindowListProviderImpl::RecreateWindowList() { } void WindowListProviderImpl::OnWindowAdded(aura::Window* window) { - DCHECK_EQ(window->parent(), container_); - if (!IsValidWindow(window)) + if (!IsValidWindow(window) || window->parent() != container_) return; window->SetProperty(kManagedKey, true); -- cgit v1.1