Observe for window's (self) deletion during activation/focus change

ui/views/corewm/focus_controller.cc

Index: ui/views/corewm/focus_controller.cc
diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc
index 780366701c12737049a8b7b3aa386d274e815ea2..4a893d89350d693f69096c21b421c1e149d2d0cc 100644
--- a/ui/views/corewm/focus_controller.cc
+++ b/ui/views/corewm/focus_controller.cc
@@ -285,9 +285,6 @@ void FocusController::SetActiveWindow(aura::Window* window) {
     active_window_->parent()->StackChildAtTop(active_window_);
   }
 
-  FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
-                    activation_observers_,
-                    OnWindowActivated(active_window_, lost_activation));
   aura::client::ActivationChangeObserver* observer =
       aura::client::GetActivationChangeObserver(lost_activation);
   if (observer)
@@ -295,6 +292,9 @@ void FocusController::SetActiveWindow(aura::Window* window) {
   observer = aura::client::GetActivationChangeObserver(active_window_);
   if (observer)
     observer->OnWindowActivated(active_window_, lost_activation);
+  FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
+                    activation_observers_,
+                    OnWindowActivated(active_window_, lost_activation));
 }
 
 void FocusController::WindowLostFocusFromDispositionChange(