Fixes bug where windows weren't being moved and resized if the desktop

ui/aura_shell/workspace/workspace_manager.h

Index: ui/aura_shell/workspace/workspace_manager.h
diff --git a/ui/aura_shell/workspace/workspace_manager.h b/ui/aura_shell/workspace/workspace_manager.h
index a9a7123da63bdfefef2b32b60c5e8eafceab4dcc..e40d3fd6a47eb255467b44b8c8fc5e3b69751e16 100644
--- a/ui/aura_shell/workspace/workspace_manager.h
+++ b/ui/aura_shell/workspace/workspace_manager.h
@@ -9,8 +9,6 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
-#include "ui/aura/desktop_observer.h"
 #include "ui/aura_shell/aura_shell_export.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/size.h"
@@ -25,10 +23,11 @@ class Rect;
 }
 
 namespace aura_shell {
+namespace internal {
 class Workspace;
 
 // WorkspaceManager manages multiple workspaces in the desktop.
-class AURA_SHELL_EXPORT WorkspaceManager : public aura::DesktopObserver {
+class AURA_SHELL_EXPORT WorkspaceManager {
  public:
   explicit WorkspaceManager(aura::Window* viewport);
   virtual ~WorkspaceManager();
@@ -38,6 +37,9 @@ class AURA_SHELL_EXPORT WorkspaceManager : public aura::DesktopObserver {
   // remove the workspace from the workspace_manager.
   Workspace* CreateWorkspace();
 
+  // Sets the active workspace.
+  void SetActiveWorkspace(Workspace* workspace);

[oshima, 2011/10/28 20:27:20]

We can move this back to private?

+
   // Returns the active workspace.
   Workspace* GetActiveWorkspace() const;
 
@@ -60,22 +62,15 @@ class AURA_SHELL_EXPORT WorkspaceManager : public aura::DesktopObserver {
   // Rotate windows by moving |source| window to the position of |target|.
   void RotateWindows(aura::Window* source, aura::Window* target);
 
-  // Overridden from aura::DesktopObserver:
-  virtual void OnDesktopResized(const gfx::Size& new_size) OVERRIDE;
-  virtual void OnActiveWindowChanged(aura::Window* active) OVERRIDE;
+  // Sets the size of a single workspace (all workspaces have the same size).
+  void SetWorkspaceSize(const gfx::Size& workspace_size);
 
  private:
   friend class Workspace;
-  FRIEND_TEST_ALL_PREFIXES(WorkspaceManagerTest, Overview);
-  FRIEND_TEST_ALL_PREFIXES(WorkspaceManagerTest, LayoutWorkspaces);
-  FRIEND_TEST_ALL_PREFIXES(WorkspaceManagerTest, FindRotateWindow);
 
   void AddWorkspace(Workspace* workspace);
   void RemoveWorkspace(Workspace* workspace);
 
-  // Sets the active workspace.
-  void SetActiveWorkspace(Workspace* workspace);
-
   // Returns the bounds of the work are given |workspace_bounds|.
   gfx::Rect GetWorkAreaBounds(const gfx::Rect& workspace_bounds);
 
@@ -101,6 +96,7 @@ class AURA_SHELL_EXPORT WorkspaceManager : public aura::DesktopObserver {
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManager);
 };
 
+}  // namespace internal
 }  // namespace aura_shell
 
 #endif  // UI_AURA_SHELL_WORKSPACE_WORKSPACE_MANAGER_H_