2 files changed, 16 insertions, 2 deletions
diff --git a/ui/aura_shell/workspace/workspace.cc b/ui/aura_shell/workspace/workspace.cc
index ba25771..be969b8 100644
--- a/ui/aura_shell/workspace/workspace.cc
+++ b/ui/aura_shell/workspace/workspace.cc
@@ -11,6 +11,7 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/property_util.h"
+#include "ui/aura_shell/window_util.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/compositor/layer.h"
@@ -95,7 +96,7 @@ bool Workspace::Contains(aura::Window* window) const {
 
 aura::Window* Workspace::FindRotateWindowForLocation(
     const gfx::Point& position) {
-  aura::Window* active = aura::RootWindow::GetInstance()->active_window();
+  aura::Window* active = aura_shell::GetActiveWindow();
   if (GetTotalWindowsWidth() < bounds_.width()) {
     // If all windows fit to the width of the workspace, it returns the
     // window which contains |position|'s x coordinate.
diff --git a/ui/aura_shell/workspace/workspace_manager_unittest.cc b/ui/aura_shell/workspace/workspace_manager_unittest.cc
index d54fb2d..91e72b5 100644
--- a/ui/aura_shell/workspace/workspace_manager_unittest.cc
+++ b/ui/aura_shell/workspace/workspace_manager_unittest.cc
@@ -10,6 +10,8 @@
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_stacking_client.h"
 #include "ui/aura/window.h"
+#include "ui/aura_shell/activation_controller.h"
+#include "ui/aura_shell/shell_window_ids.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_observer.h"
 #include "ui/base/ui_base_types.h"
@@ -77,7 +79,16 @@ namespace internal {
 
 class WorkspaceManagerTestBase : public aura::test::AuraTestBase {
  public:
-  WorkspaceManagerTestBase() {}
+  WorkspaceManagerTestBase() {
+    aura::test::TestStackingClient* stacking_client =
+        static_cast<aura::test::TestStackingClient*>(
+            aura::RootWindow::GetInstance()->stacking_client());
+    stacking_client->default_container()->set_id(
+        internal::kShellWindowId_DefaultContainer);
+    activation_controller_.reset(new internal::ActivationController);
+    activation_controller_->set_default_container_for_test(
+        stacking_client->default_container());
+  }
   virtual ~WorkspaceManagerTestBase() {}
 
   virtual void SetUp() OVERRIDE {
@@ -102,6 +113,8 @@ class WorkspaceManagerTestBase : public aura::test::AuraTestBase {
   scoped_ptr<WorkspaceManager> manager_;
 
  private:
+  scoped_ptr<internal::ActivationController> activation_controller_;
+
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManagerTestBase);
 };