Moves management of transients out of Window

ui/views/corewm/focus_controller_unittest.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/focus_controller.h"
 
 #include <map>
 
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/events/event_handler.h"
 #include "ui/views/corewm/base_focus_rules.h"
+#include "ui/views/corewm/transient_window_stacking_client.h"
 
 namespace views {
 namespace corewm {
 
 class FocusNotificationObserver : public aura::client::ActivationChangeObserver,
                                   public aura::client::FocusChangeObserver {
  public:
   FocusNotificationObserver()
       : activation_changed_count_(0),
         focus_changed_count_(0),
@@ skipping 173 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestFocusRules);
 };
 
 // Common infrastructure shared by all FocusController test types.
 class FocusControllerTestBase : public aura::test::AuraTestBase {
  protected:
   FocusControllerTestBase() {}
 
   // Overridden from aura::test::AuraTestBase:
   virtual void SetUp() OVERRIDE {
+    // SetWindowStackingClient() takes ownership of
+    // TransientWindowStackingClient.
+    aura::client::SetWindowStackingClient(
+        new corewm::TransientWindowStackingClient);
     // FocusController registers itself as an Env observer so it can catch all
     // window initializations, including the root_window()'s, so we create it
     // before allowing the base setup.
     test_focus_rules_ = new TestFocusRules;
     focus_controller_.reset(new FocusController(test_focus_rules_));
     aura::test::AuraTestBase::SetUp();
     root_window()->AddPreTargetHandler(focus_controller_.get());
     aura::client::SetFocusClient(root_window(), focus_controller_.get());
     aura::client::SetActivationClient(root_window(), focus_controller_.get());
 
@@ skipping 26 matching lines @@
         gfx::Rect(1, 1, 5, 5), w21);
     aura::test::CreateTestWindowWithDelegate(
         aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 3,
         gfx::Rect(125, 125, 50, 50), root_window());
   }
   virtual void TearDown() OVERRIDE {
     root_window()->RemovePreTargetHandler(focus_controller_.get());
     aura::test::AuraTestBase::TearDown();
     test_focus_rules_ = NULL;  // Owned by FocusController.
     focus_controller_.reset();
+    aura::client::SetWindowStackingClient(NULL);
   }
 
   void FocusWindow(aura::Window* window) {
     aura::client::GetFocusClient(root_window())->FocusWindow(window);
   }
   aura::Window* GetFocusedWindow() {
     return aura::client::GetFocusClient(root_window())->GetFocusedWindow();
   }
   int GetFocusedWindowId() {
     aura::Window* focused_window = GetFocusedWindow();
@@ skipping 742 matching lines @@
 DIRECT_FOCUS_CHANGE_TESTS(NoShiftActiveOnActivation);
 
 // Clicking on a window which has capture should not result in a focus change.
 DIRECT_FOCUS_CHANGE_TESTS(NoFocusChangeOnClickOnCaptureWindow);
 
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest,
                       ChangeFocusWhenNothingFocusedAndCaptured);
 
 }  // namespace corewm
 }  // namespace views