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

Unified Diff: athena/wm/window_list_provider_impl.cc

Issue 678833002: Revert the if -> DCHECK change (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_list_provider_impl.cc
diff --git a/athena/wm/window_list_provider_impl.cc b/athena/wm/window_list_provider_impl.cc
index 74b0a9bd69b7159166f4b2b5070e5baf7e92831f..cfcb7ebeeca91bf07235dadfb7e6868e057781e4 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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698