diff options
| author | Mitsuru Oshima <oshima@chromium.org> | 2014-10-24 17:20:07 -0700 |
|---|---|---|
| committer | Mitsuru Oshima <oshima@chromium.org> | 2014-10-25 00:20:37 +0000 |
| commit | 22dc5ff3ebf33f9e9a40e0f71939fd274e13972b (patch) | |
| tree | cbba51c109006e0f0a1a1c90ce9c65db0ed5778b | |
| parent | b67dd6d2be03f6c970cd34d1790440d4ce89fafc (diff) | |
| download | chromium_src-22dc5ff3ebf33f9e9a40e0f71939fd274e13972b.zip chromium_src-22dc5ff3ebf33f9e9a40e0f71939fd274e13972b.tar.gz chromium_src-22dc5ff3ebf33f9e9a40e0f71939fd274e13972b.tar.bz2 | |
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}
| -rw-r--r-- | athena/wm/window_list_provider_impl.cc | 3 |
1 files changed, 1 insertions, 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); |