More unittests passing with new focus controller.

ui/views/corewm/window_modality_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/window_modality_controller.h"
 
 #include <algorithm>
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
@@ skipping 102 matching lines @@
   return ProcessLocatedEvent(target, event) ? ui::ER_CONSUMED :
                                               ui::ER_UNHANDLED;
 }
 
 ui::EventResult WindowModalityController::OnTouchEvent(ui::TouchEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
   return ProcessLocatedEvent(target, event) ? ui::ER_CONSUMED :
                                               ui::ER_UNHANDLED;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// WindowModalityController, aura::EnvObserver implementation:
+
 void WindowModalityController::OnWindowInitialized(aura::Window* window) {
   windows_.push_back(window);
   window->AddObserver(this);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// WindowModalityController, aura::WindowObserver implementation:
+
+void WindowModalityController::OnWindowPropertyChanged(aura::Window* window,
+                                                       const void* key,
+                                                       intptr_t old) {
+  // In tests, we sometimes create the modality relationship after a window is
+  // visible.
+  if (key == aura::client::kModalKey &&
+      window->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_NONE &&
+      window->IsVisible()) {
+    ActivateWindow(window);
+  }
+}
+
 void WindowModalityController::OnWindowVisibilityChanged(
     aura::Window* window,
     bool visible) {
   if (visible && window->GetProperty(aura::client::kModalKey) ==
       ui::MODAL_TYPE_WINDOW) {
     // Make sure no other window has capture, otherwise |window| won't get mouse
     // events.
     aura::Window* capture_window = aura::client::GetCaptureWindow(window);
     if (capture_window)
       capture_window->ReleaseCapture();
@@ skipping 10 matching lines @@
   aura::Window* modal_transient_child = GetModalTransient(target);
   if (modal_transient_child && (event->type() == ui::ET_MOUSE_PRESSED ||
                                 event->type() == ui::ET_TOUCH_PRESSED)) {
     AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE);
   }
   return !!modal_transient_child;
 }
 
 }  // namespace corewm
 }  // namespace views