Add workspace to desktop

ui/aura_shell/workspace/workspace_manager.cc

Index: ui/aura_shell/workspace/workspace_manager.cc
diff --git a/ui/aura_shell/workspace/workspace_manager.cc b/ui/aura_shell/workspace/workspace_manager.cc
index ed76cf1f081db42aaafccb37f69cf8560f92257e..410ace11474528ced8138181083bd90fb09c7f42 100644
--- a/ui/aura_shell/workspace/workspace_manager.cc
+++ b/ui/aura_shell/workspace/workspace_manager.cc
@@ -5,14 +5,28 @@
 
 #include <algorithm>
 
+#include "base/auto_reset.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/transform.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "ui/aura_shell/workspace/workspace.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 {
@@ -20,17 +34,25 @@ namespace aura_shell {
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManager, public:
 
-WorkspaceManager::WorkspaceManager()
-    : active_workspace_(NULL) {
+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() {
-  return new Workspace(this);
+  Workspace* workspace = new Workspace(this);
+  LayoutWorkspaces();
+  return workspace;
 }
 
 Workspace* WorkspaceManager::GetActiveWorkspace() const {
@@ -40,34 +62,82 @@ Workspace* WorkspaceManager::GetActiveWorkspace() const {
 Workspace* WorkspaceManager::FindBy(aura::Window* window) const {
   for (Workspaces::const_iterator i = workspaces_.begin();
        i != workspaces_.end();
-       i++) {
+       ++i) {
     if ((*i)->Contains(window))
       return *i;
   }
   return NULL;
 }
 
-void WorkspaceManager::Layout() {
+void WorkspaceManager::LayoutWorkspaces() {
+  UpdateViewport();
+
   gfx::Rect bounds(workspace_size_);
   int x = 0;
   for (Workspaces::const_iterator i = workspaces_.begin();
        i != workspaces_.end();
-       i++) {
+       ++i) {
     Workspace* workspace = *i;
     bounds.set_x(x);
     workspace->SetBounds(bounds);
-    x += workspace_size_.width() + kWorkspaceHorizontalMargin;
+    x += bounds.width() + kWorkspaceHorizontalMargin;
   }
 }
 
-int WorkspaceManager::GetTotalWidth() const {
-  return !workspaces_.size() ? 0 :
-      workspace_size().width() * workspaces_.size() +
-      kWorkspaceHorizontalMargin * (workspaces_.size() - 1);
+gfx::Rect WorkspaceManager::GetDragAreaBounds() {
+  return GetWorkAreaBounds(gfx::Rect(viewport_->bounds().size()));
+}
+
+void WorkspaceManager::SetOverview(bool overview) {
+  if (is_overview_ == overview)
+    return;
+  is_overview_ = overview;
+  gfx::Rect bounds = viewport_->GetTargetBounds();
+
+  ui::Transform transform;
+  if (is_overview_) {
+    // TODO(oshima|sky): We limit the how small windows can be shrinked
+    // in overview mode, thus part of the viewport may not be visible.
+    // We need to add capability to scroll/move viewport in overview mode.
+    float scale = std::min(
+        kMaxOverviewScale,
+        workspace_size_.width() /
+        static_cast<float>(viewport_->bounds().width()));
+    scale = std::max(kMinOverviewScale, scale);
+
+    transform.SetScale(scale, scale);
+
+    int overview_width = viewport_->bounds().width() * scale;
+    int dx = overview_width < workspace_size_.width() ?
+        (workspace_size_.width() - overview_width) / 2 : 0;
+
+    transform.SetTranslateX(-viewport_->GetTargetBounds().x() + dx);
+    transform.SetTranslateY(workspace_size_.height() *  (1.0f - scale) / 2);
+  } else {
+    transform.SetTranslateX(-active_workspace_->bounds().x());
+  }
+
+  viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
+  viewport_->layer()->SetTransform(transform);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// WindowManager, private:
+// WorkspaceManager, Overridden from aura::DesktopObserver:
+
+void WorkspaceManager::OnDesktopResized(const gfx::Size& new_size) {
+  workspace_size_ =
+      gfx::Screen::GetMonitorAreaNearestWindow(viewport_).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(),
@@ -85,6 +155,7 @@ void WorkspaceManager::RemoveWorkspace(Workspace* workspace) {
   if (workspace == active_workspace_)
     active_workspace_ = NULL;
   workspaces_.erase(i);
+  LayoutWorkspaces();
 }
 
 void WorkspaceManager::SetActiveWorkspace(Workspace* workspace) {
@@ -93,6 +164,37 @@ void WorkspaceManager::SetActiveWorkspace(Workspace* workspace) {
                    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;
+}
+
+void WorkspaceManager::UpdateViewport() {
+  int num_workspaces = std::max(1, static_cast<int>(workspaces_.size()));
+  int total_width = workspace_size_.width() * num_workspaces +
+      kWorkspaceHorizontalMargin * (num_workspaces - 1);
+  gfx::Rect bounds(0, 0, total_width, workspace_size_.height());
+
+  if (viewport_->GetTargetBounds() != bounds)
+    viewport_->SetBounds(bounds);
+
+  // Move to active workspace.
+  if (active_workspace_) {
+    ui::Transform transform;
+    transform.SetTranslateX(-active_workspace_->bounds().x());
+    viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
+    viewport_->SetTransform(transform);
+  }
 }
 
 }  // namespace aura_shell