Adds an interface between WorkspaceController and

ash/wm/workspace/workspace_manager.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 "ash/wm/workspace/workspace_manager.h"
 
 #include <algorithm>
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 61 matching lines @@
          !window->transient_parent() &&
          ash::GetTrackedByWorkspace(window) &&
          (!ash::GetPersistsAcrossAllWorkspaces(window) ||
           wm::IsWindowMaximized(window));
 }
 
 bool WorkspaceManager::Contains(aura::Window* window) const {
   return FindBy(window) != NULL;
 }
 
-bool WorkspaceManager::IsInMaximizedMode() const {
-  return active_workspace_ &&
-      active_workspace_->type() == Workspace::TYPE_MAXIMIZED;
-}
-
 void WorkspaceManager::AddWindow(aura::Window* window) {
   DCHECK(ShouldManageWindow(window));
 
   Workspace* current_workspace = FindBy(window);
   if (current_workspace) {
     // Already know about this window. Make sure the workspace is active.
     if (active_workspace_ != current_workspace) {
       if (active_workspace_)
         window->layer()->GetAnimator()->StopAnimating();
       current_workspace->Activate();
@@ skipping 24 matching lines @@
 }
 
 void WorkspaceManager::RemoveWindow(aura::Window* window) {
   Workspace* workspace = FindBy(window);
   if (!workspace)
     return;
   workspace->RemoveWindow(window);
   CleanupWorkspace(workspace);
 }
 
-void WorkspaceManager::SetActiveWorkspaceByWindow(aura::Window* window) {
-  Workspace* workspace = FindBy(window);
-  if (workspace)
-    workspace->Activate();
-}
-
-void WorkspaceManager::SetGridSize(int grid_size) {
-  grid_size_ = grid_size;
-}
-
 void WorkspaceManager::UpdateShelfVisibility() {
   if (shelf_)
     shelf_->UpdateVisibilityState();
 }
 
+void WorkspaceManager::ShowStateChanged(aura::Window* window) {
+  Workspace* workspace = FindBy(window);
+  if (!workspace)
+    return;
+  if (!ShouldManageWindow(window)) {
+    RemoveWindow(window);
+  } else {
+    Workspace::Type old_type = workspace->type();
+    Workspace::Type new_type = Workspace::TypeForWindow(window);
+    if (new_type != old_type)
+      OnTypeOfWorkspacedNeededChanged(window);
+  }
+  UpdateShelfVisibility();
+}
+
+bool WorkspaceManager::IsInMaximizedMode() const {
+  return active_workspace_ &&
+      active_workspace_->type() == Workspace::TYPE_MAXIMIZED;
+}
+
+void WorkspaceManager::SetGridSize(int size) {
+  grid_size_ = size;
+}
+
+int WorkspaceManager::GetGridSize() const {
+  return grid_size_;
+}
+
 WorkspaceWindowState WorkspaceManager::GetWindowState() const {
   if (!shelf_ || !active_workspace_)
     return WORKSPACE_WINDOW_STATE_DEFAULT;
 
   // TODO: this code needs to be made multi-display aware.
   gfx::Rect shelf_bounds(shelf_->GetIdealBounds());
   const aura::Window::Windows& windows(contents_view_->children());
   bool window_overlaps_launcher = false;
   bool has_maximized_window = false;
   for (aura::Window::Windows::const_iterator i = windows.begin();
@@ skipping 12 matching lines @@
       window_overlaps_launcher = true;
   }
   if (has_maximized_window)
     return WORKSPACE_WINDOW_STATE_MAXIMIZED;
 
   return window_overlaps_launcher ?
       WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF :
       WORKSPACE_WINDOW_STATE_DEFAULT;
 }
 
-void WorkspaceManager::ShowStateChanged(aura::Window* window) {
+void WorkspaceManager::SetShelf(ShelfLayoutManager* shelf) {
+  shelf_ = shelf;
+}
+
+void WorkspaceManager::SetActiveWorkspaceByWindow(aura::Window* window) {
   Workspace* workspace = FindBy(window);
-  if (!workspace)
-    return;
-  if (!ShouldManageWindow(window)) {
-    RemoveWindow(window);
-  } else {
-    Workspace::Type old_type = workspace->type();
-    Workspace::Type new_type = Workspace::TypeForWindow(window);
-    if (new_type != old_type)
-      OnTypeOfWorkspacedNeededChanged(window);
-  }
-  UpdateShelfVisibility();
+  if (workspace)
+    workspace->Activate();
+}
+
+aura::Window* WorkspaceManager::GetParentForNewWindow(aura::Window* window) {
+  return contents_view_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WorkspaceManager, private:
 
 void WorkspaceManager::AddWorkspace(Workspace* workspace) {
   DCHECK(std::find(workspaces_.begin(), workspaces_.end(),
                    workspace) == workspaces_.end());
   if (active_workspace_) {
     // New workspaces go right after current workspace.
@@ skipping 151 matching lines @@
   return workspace;
 }
 
 void WorkspaceManager::CleanupWorkspace(Workspace* workspace) {
   if (workspace->type() != Workspace::TYPE_MANAGED && workspace->is_empty())
     delete workspace;
 }
 
 }  // namespace internal
 }  // namespace ash