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

ui/aura_shell/workspace/workspace_manager.cc

 // Copyright (c) 2011 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/aura_shell/workspace/workspace_manager.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
+#include "base/logging.h"
+#include "base/stl_util.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/workspace/workspace.h"
-#include "ui/aura_shell/workspace/workspace_manager.h"
-#include "ui/gfx/screen.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
+#include "ui/gfx/screen.h"
 #include "ui/gfx/transform.h"
-#include "base/logging.h"
-#include "base/stl_util.h"
 
 namespace {
 
 // The horizontal margein between workspaces in pixels.
 const int kWorkspaceHorizontalMargin = 50;
 
 // Minimum/maximum scale for overview mode.
 const float kMaxOverviewScale = 0.9f;
 const float kMinOverviewScale = 0.3f;
 
 }
 
 namespace aura_shell {
+namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManager, public:
 
 WorkspaceManager::WorkspaceManager(aura::Window* viewport)
     : viewport_(viewport),
       active_workspace_(NULL),
       workspace_size_(
           gfx::Screen::GetMonitorAreaNearestWindow(viewport_).size()),
       is_overview_(false) {
-  aura::Desktop::GetInstance()->AddObserver(this);
 }
 
 WorkspaceManager::~WorkspaceManager() {
-  aura::Desktop::GetInstance()->RemoveObserver(this);
   std::vector<Workspace*> copy_to_delete(workspaces_);
   STLDeleteElements(&copy_to_delete);
 }
 
 Workspace* WorkspaceManager::CreateWorkspace() {
   Workspace* workspace = new Workspace(this);
   LayoutWorkspaces();
   return workspace;
 }
 
+void WorkspaceManager::SetActiveWorkspace(Workspace* workspace) {
+  DCHECK(std::find(workspaces_.begin(),
+                   workspaces_.end(),
+                   workspace)
+         != workspaces_.end());
+  active_workspace_ = workspace;
+
+  DCHECK(!workspaces_.empty());
+
+  is_overview_ = false;
+  UpdateViewport();
+}
+
 Workspace* WorkspaceManager::GetActiveWorkspace() const {
   return active_workspace_;
 }
 
 Workspace* WorkspaceManager::FindBy(aura::Window* window) const {
   int index = GetWorkspaceIndexContaining(window);
   return index < 0 ? NULL : workspaces_[index];
 }
 
 aura::Window* WorkspaceManager::FindRotateWindowForLocation(
@@ skipping 90 matching lines @@
       for (int i = target_ws_index; i <= source_ws_index; ++i) {
         insert = workspaces_[i]->ShiftWindows(
             insert, source, target, Workspace::SHIFT_TO_RIGHT);
         // |target| can only be in the 1st workspace.
         target = NULL;
       }
     }
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// WorkspaceManager, Overridden from aura::DesktopObserver:
-
-void WorkspaceManager::OnDesktopResized(const gfx::Size& new_size) {
-  workspace_size_ =
-      gfx::Screen::GetMonitorAreaNearestWindow(viewport_).size();
+void WorkspaceManager::SetWorkspaceSize(const gfx::Size& workspace_size) {
+  if (workspace_size == workspace_size_)
+    return;
+  workspace_size_ = workspace_size;
   LayoutWorkspaces();
 }
 
-void WorkspaceManager::OnActiveWindowChanged(aura::Window* active) {
-  Workspace* workspace = FindBy(active);
-  if (workspace)
-    SetActiveWorkspace(workspace);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // WorkspaceManager, private:
 
 void WorkspaceManager::AddWorkspace(Workspace* workspace) {
   Workspaces::iterator i = std::find(workspaces_.begin(),
                                      workspaces_.end(),
                                      workspace);
   DCHECK(i == workspaces_.end());
   workspaces_.push_back(workspace);
 }
 
 void WorkspaceManager::RemoveWorkspace(Workspace* workspace) {
   Workspaces::iterator i = std::find(workspaces_.begin(),
                                      workspaces_.end(),
                                      workspace);
   DCHECK(i != workspaces_.end());
   if (workspace == active_workspace_)
     active_workspace_ = NULL;
   workspaces_.erase(i);
   LayoutWorkspaces();
 }
 
-void WorkspaceManager::SetActiveWorkspace(Workspace* workspace) {
-  DCHECK(std::find(workspaces_.begin(),
-                   workspaces_.end(),
-                   workspace)
-         != workspaces_.end());
-  active_workspace_ = workspace;
-
-  DCHECK(!workspaces_.empty());
-
-  is_overview_ = false;
-  UpdateViewport();
-}
-
 gfx::Rect WorkspaceManager::GetWorkAreaBounds(
     const gfx::Rect& workspace_bounds) {
   gfx::Rect bounds = workspace_bounds;
   bounds.Inset(
       aura::Desktop::GetInstance()->screen()->work_area_insets());
   return bounds;
 }
 
 // Returns the index of the workspace that contains the |window|.
 int WorkspaceManager::GetWorkspaceIndexContaining(aura::Window* window) const {
@@ skipping 18 matching lines @@
   // Move to active workspace.
   if (active_workspace_) {
     ui::Transform transform;
     transform.SetTranslateX(-active_workspace_->bounds().x());
     ui::LayerAnimator::ScopedSettings settings(
         viewport_->layer()->GetAnimator());
     viewport_->SetTransform(transform);
   }
 }
 
+}  // namespace internal
 }  // namespace aura_shell