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

Unified Diff: ui/aura/mus/window_tree_client.cc

Issue 2714763002: Change FocusSynchronizer to maintain active focus client and window. (Closed)
Patch Set: fix crash in aura_test_helper tear down Created 3 years, 9 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/aura/mus/window_tree_client.cc
diff --git a/ui/aura/mus/window_tree_client.cc b/ui/aura/mus/window_tree_client.cc
index 3574d71869b49e99c77187a926118eda7c4e9e75..d6bc278b38ac2d5dc21f829f287cfa3b63f05133 100644
--- a/ui/aura/mus/window_tree_client.cc
+++ b/ui/aura/mus/window_tree_client.cc
@@ -618,7 +618,7 @@ void WindowTreeClient::OnWindowMusCreated(WindowMus* window) {
}
void WindowTreeClient::OnWindowMusDestroyed(WindowMus* window, Origin origin) {
- if (focus_synchronizer_->focused_window() == window)
+ if (WindowMus::Get(focus_synchronizer_->focused_window()) == window)
focus_synchronizer_->OnFocusedWindowDestroyed();
// TODO: decide how to deal with windows not owned by this client.

Powered by Google App Engine
This is Rietveld 408576698