Renames and moves some workspace related classes to the workspace

directory.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9226040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118620 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 62 insertions, 63 deletions

diff --git a/ash/wm/default_container_event_filter.cc b/ash/wm/workspace/workspace_event_filter.cc
index 241c1af..66aecb4 100644
--- a/ash/wm/default_container_event_filter.cc
+++ b/ash/wm/workspace/workspace_event_filter.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/default_container_event_filter.h"
+#include "ash/wm/workspace/workspace_event_filter.h"
 
-#include "ash/wm/default_container_layout_manager.h"
 #include "ash/wm/window_frame.h"
 #include "ash/wm/window_util.h"
+#include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
@@ -31,19 +31,19 @@ void WindowHoverChanged(aura::Window* window, bool hovered) {
 namespace ash {
 namespace internal {
 
-DefaultContainerEventFilter::DefaultContainerEventFilter(aura::Window* owner)
+WorkspaceEventFilter::WorkspaceEventFilter(aura::Window* owner)
     : ToplevelWindowEventFilter(owner),
       drag_state_(DRAG_NONE),
       hovered_window_(NULL) {
 }
 
-DefaultContainerEventFilter::~DefaultContainerEventFilter() {
+WorkspaceEventFilter::~WorkspaceEventFilter() {
 }
 
-bool DefaultContainerEventFilter::PreHandleMouseEvent(aura::Window* target,
-                                                      aura::MouseEvent* event) {
-  DefaultContainerLayoutManager* layout_manager =
-      static_cast<DefaultContainerLayoutManager*>(owner()->layout_manager());
+bool WorkspaceEventFilter::PreHandleMouseEvent(aura::Window* target,
+                                               aura::MouseEvent* event) {
+  WorkspaceLayoutManager* layout_manager =
+      static_cast<WorkspaceLayoutManager*>(owner()->layout_manager());
   DCHECK(layout_manager);
 
   // TODO(oshima|derat): Incorporate the logic below and introduce DragObserver
@@ -95,7 +95,7 @@ bool DefaultContainerEventFilter::PreHandleMouseEvent(aura::Window* target,
   return handled;
 }
 
-bool DefaultContainerEventFilter::UpdateDragState() {
+bool WorkspaceEventFilter::UpdateDragState() {
   DCHECK_EQ(DRAG_NONE, drag_state_);
   switch (window_component()) {
     case HTCAPTION:
@@ -118,7 +118,7 @@ bool DefaultContainerEventFilter::UpdateDragState() {
   return true;
 }
 
-void DefaultContainerEventFilter::UpdateHoveredWindow(
+void WorkspaceEventFilter::UpdateHoveredWindow(
     aura::Window* toplevel_window) {
   if (toplevel_window == hovered_window_)
     return;
diff --git a/ash/wm/default_container_event_filter.h b/ash/wm/workspace/workspace_event_filter.h
index 55baf01..d6765fa 100644
--- a/ash/wm/default_container_event_filter.h
+++ b/ash/wm/workspace/workspace_event_filter.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef ASH_WM_DEFAULT_CONTAINER_EVENT_FILTER_H_
-#define ASH_WM_DEFAULT_CONTAINER_EVENT_FILTER_H_
+#ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_FILTER_H_
+#define ASH_WM_WORKSPACE_WORKSPACE_EVENT_FILTER_H_
 #pragma once
 
 #include "ash/wm/toplevel_window_event_filter.h"
@@ -16,10 +16,10 @@ class Window;
 namespace ash {
 namespace internal {
 
-class DefaultContainerEventFilter : public ToplevelWindowEventFilter {
+class WorkspaceEventFilter : public ToplevelWindowEventFilter {
  public:
-  explicit DefaultContainerEventFilter(aura::Window* owner);
-  virtual ~DefaultContainerEventFilter();
+  explicit WorkspaceEventFilter(aura::Window* owner);
+  virtual ~WorkspaceEventFilter();
 
   // Overridden from ToplevelWindowEventFilter:
   virtual bool PreHandleMouseEvent(aura::Window* target,
@@ -46,10 +46,10 @@ class DefaultContainerEventFilter : public ToplevelWindowEventFilter {
   // Top-level window under the mouse cursor.
   aura::Window* hovered_window_;
 
-  DISALLOW_COPY_AND_ASSIGN(DefaultContainerEventFilter);
+  DISALLOW_COPY_AND_ASSIGN(WorkspaceEventFilter);
 };
 
 }  // namespace internal
 }  // namespace ash
 
-#endif  //  ASH_WM_DEFAULT_CONTAINER_EVENT_FILTER_H_
+#endif  // ASH_WM_WORKSPACE_WORKSPACE_EVENT_FILTER_H_
diff --git a/ash/wm/default_container_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc
index 83360c0..a4b95d4 100644
--- a/ash/wm/default_container_layout_manager.cc
+++ b/ash/wm/workspace/workspace_layout_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/default_container_layout_manager.h"
+#include "ash/wm/workspace/workspace_layout_manager.h"
 
 #include "ash/wm/property_util.h"
 #include "ash/wm/show_state_controller.h"
@@ -23,29 +23,29 @@ namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
-// DefaultContainerLayoutManager, public:
+// WorkspaceLayoutManager, public:
 
-DefaultContainerLayoutManager::DefaultContainerLayoutManager(
+WorkspaceLayoutManager::WorkspaceLayoutManager(
     WorkspaceManager* workspace_manager)
     : workspace_manager_(workspace_manager),
       show_state_controller_(new ShowStateController(workspace_manager)) {
 }
 
-DefaultContainerLayoutManager::~DefaultContainerLayoutManager() {}
+WorkspaceLayoutManager::~WorkspaceLayoutManager() {}
 
-void DefaultContainerLayoutManager::PrepareForMoveOrResize(
+void WorkspaceLayoutManager::PrepareForMoveOrResize(
     aura::Window* drag,
     aura::MouseEvent* event) {
   workspace_manager_->set_ignored_window(drag);
 }
 
-void DefaultContainerLayoutManager::CancelMoveOrResize(
+void WorkspaceLayoutManager::CancelMoveOrResize(
     aura::Window* drag,
     aura::MouseEvent* event) {
   workspace_manager_->set_ignored_window(NULL);
 }
 
-void DefaultContainerLayoutManager::ProcessMove(
+void WorkspaceLayoutManager::ProcessMove(
     aura::Window* drag,
     aura::MouseEvent* event) {
   // TODO(oshima): Just zooming out may (and will) move/swap window without
@@ -66,7 +66,7 @@ void DefaultContainerLayoutManager::ProcessMove(
     workspace_manager_->RotateWindows(drag, rotate_target);
 }
 
-void DefaultContainerLayoutManager::EndMove(
+void WorkspaceLayoutManager::EndMove(
     aura::Window* drag,
     aura::MouseEvent* evnet) {
   // TODO(oshima): finish moving window between workspaces.
@@ -77,7 +77,7 @@ void DefaultContainerLayoutManager::EndMove(
   workspace_manager_->SetOverview(false);
 }
 
-void DefaultContainerLayoutManager::EndResize(
+void WorkspaceLayoutManager::EndResize(
     aura::Window* drag,
     aura::MouseEvent* evnet) {
   workspace_manager_->set_ignored_window(NULL);
@@ -88,13 +88,13 @@ void DefaultContainerLayoutManager::EndResize(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DefaultContainerLayoutManager, aura::LayoutManager implementation:
+// WorkspaceLayoutManager, aura::LayoutManager implementation:
 
-void DefaultContainerLayoutManager::OnWindowResized() {
+void WorkspaceLayoutManager::OnWindowResized() {
   // Workspace is updated via RootWindowObserver::OnRootWindowResized.
 }
 
-void DefaultContainerLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
+void WorkspaceLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
   if (child->type() != aura::client::WINDOW_TYPE_NORMAL ||
       child->transient_parent()) {
     return;
@@ -120,7 +120,7 @@ void DefaultContainerLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
   new_workspace->Activate();
 }
 
-void DefaultContainerLayoutManager::OnWillRemoveWindowFromLayout(
+void WorkspaceLayoutManager::OnWillRemoveWindowFromLayout(
     aura::Window* child) {
   child->RemoveObserver(show_state_controller_.get());
   ClearRestoreBounds(child);
@@ -133,13 +133,13 @@ void DefaultContainerLayoutManager::OnWillRemoveWindowFromLayout(
     delete workspace;
 }
 
-void DefaultContainerLayoutManager::OnChildWindowVisibilityChanged(
+void WorkspaceLayoutManager::OnChildWindowVisibilityChanged(
     aura::Window* child,
     bool visible) {
   NOTIMPLEMENTED();
 }
 
-void DefaultContainerLayoutManager::SetChildBounds(
+void WorkspaceLayoutManager::SetChildBounds(
     aura::Window* child,
     const gfx::Rect& requested_bounds) {
   gfx::Rect adjusted_bounds = requested_bounds;
diff --git a/ash/wm/default_container_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h
index b61866d..3fdceb8 100644
--- a/ash/wm/default_container_layout_manager.h
+++ b/ash/wm/workspace/workspace_layout_manager.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef ASH_WM_DEFAULT_CONTAINER_LAYOUT_MANAGER_H_
-#define ASH_WM_DEFAULT_CONTAINER_LAYOUT_MANAGER_H_
+#ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
+#define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -28,11 +28,10 @@ class ShowStateController;
 class WorkspaceManager;
 
 // LayoutManager for the default window container.
-class ASH_EXPORT DefaultContainerLayoutManager
-    : public aura::LayoutManager {
+class ASH_EXPORT WorkspaceLayoutManager : public aura::LayoutManager {
  public:
-  explicit DefaultContainerLayoutManager(WorkspaceManager* workspace_manager);
-  virtual ~DefaultContainerLayoutManager();
+  explicit WorkspaceLayoutManager(WorkspaceManager* workspace_manager);
+  virtual ~WorkspaceLayoutManager();
 
   // Returns the workspace manager for this container.
   WorkspaceManager* workspace_manager() {
@@ -68,10 +67,10 @@ class ASH_EXPORT DefaultContainerLayoutManager
 
   scoped_ptr<ShowStateController> show_state_controller_;
 
-  DISALLOW_COPY_AND_ASSIGN(DefaultContainerLayoutManager);
+  DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_WM_DEFAULT_CONTAINER_LAYOUT_MANAGER_H_
+#endif  // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
diff --git a/ash/wm/default_container_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 4e7e067..ac2504e 100644
--- a/ash/wm/default_container_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/default_container_layout_manager.h"
+#include "ash/wm/workspace/workspace_layout_manager.h"
 
 #include "ash/wm/workspace/workspace.h"
 #include "ash/wm/workspace/workspace_manager.h"
@@ -24,12 +24,12 @@ namespace test {
 namespace {
 
 using views::Widget;
-using ash::internal::DefaultContainerLayoutManager;
+using ash::internal::WorkspaceLayoutManager;
 
-class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
+class WorkspaceLayoutManagerTest : public aura::test::AuraTestBase {
  public:
-  DefaultContainerLayoutManagerTest() : layout_manager_(NULL) {}
-  virtual ~DefaultContainerLayoutManagerTest() {}
+  WorkspaceLayoutManagerTest() : layout_manager_(NULL) {}
+  virtual ~WorkspaceLayoutManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
@@ -38,7 +38,7 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
         CreateTestWindow(gfx::Rect(0, 0, 500, 400), root_window));
     workspace_controller_.reset(
         new ash::internal::WorkspaceController(container_.get()));
-    layout_manager_ = new DefaultContainerLayoutManager(
+    layout_manager_ = new WorkspaceLayoutManager(
         workspace_controller_->workspace_manager());
     container_->SetLayoutManager(layout_manager_);
 
@@ -66,7 +66,7 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
 
   aura::Window* container() { return container_.get(); }
 
-  DefaultContainerLayoutManager* default_container_layout_manager() {
+  WorkspaceLayoutManager* default_container_layout_manager() {
     return layout_manager_;
   }
 
@@ -79,10 +79,10 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
   scoped_ptr<aura::Window> container_;
   scoped_ptr<ash::internal::WorkspaceController> workspace_controller_;
   // LayoutManager is owned by |container|.
-  ash::internal::DefaultContainerLayoutManager* layout_manager_;
+  ash::internal::WorkspaceLayoutManager* layout_manager_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(DefaultContainerLayoutManagerTest);
+  DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerTest);
 };
 
 // Utility functions to set and get show state on |window|.
@@ -106,7 +106,7 @@ ui::WindowShowState GetShowState(aura::Window* window) {
 
 }  // namespace
 
-TEST_F(DefaultContainerLayoutManagerTest, SetBounds) {
+TEST_F(WorkspaceLayoutManagerTest, SetBounds) {
   // Layout Manager moves the window to (0,0) to fit to draggable area.
   scoped_ptr<aura::Window> child(
       CreateTestWindow(gfx::Rect(0, -1000, 100, 100), container()));
@@ -128,7 +128,7 @@ TEST_F(DefaultContainerLayoutManagerTest, SetBounds) {
   EXPECT_EQ("0,0 500x400", child->bounds().ToString());
 }
 
-TEST_F(DefaultContainerLayoutManagerTest, DragWindow) {
+TEST_F(WorkspaceLayoutManagerTest, DragWindow) {
   scoped_ptr<aura::Window> child(
       CreateTestWindow(gfx::Rect(0, -1000, 50, 50), container()));
   gfx::Rect original_bounds = child->bounds();
@@ -144,7 +144,7 @@ TEST_F(DefaultContainerLayoutManagerTest, DragWindow) {
   EXPECT_EQ(original_bounds.ToString(), child->GetTargetBounds().ToString());
 }
 
-TEST_F(DefaultContainerLayoutManagerTest, Popup) {
+TEST_F(WorkspaceLayoutManagerTest, Popup) {
   scoped_ptr<aura::Window> popup(
       CreateTestWindowWithType(gfx::Rect(0, -1000, 100, 100),
                                container(),
@@ -163,7 +163,7 @@ TEST_F(DefaultContainerLayoutManagerTest, Popup) {
 
 // Make sure a window with a transient parent isn't resized by the layout
 // manager.
-TEST_F(DefaultContainerLayoutManagerTest, IgnoreTransient) {
+TEST_F(WorkspaceLayoutManagerTest, IgnoreTransient) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
@@ -175,7 +175,7 @@ TEST_F(DefaultContainerLayoutManagerTest, IgnoreTransient) {
   EXPECT_EQ("0,0 200x200", window->bounds().ToString());
 }
 
-TEST_F(DefaultContainerLayoutManagerTest, Fullscreen) {
+TEST_F(WorkspaceLayoutManagerTest, Fullscreen) {
   scoped_ptr<aura::Window> w(
       CreateTestWindow(gfx::Rect(0, 0, 100, 100), container()));
   gfx::Rect fullscreen_bounds =
@@ -215,7 +215,7 @@ TEST_F(DefaultContainerLayoutManagerTest, Fullscreen) {
   EXPECT_EQ(50, w->bounds().height());
 }
 
-TEST_F(DefaultContainerLayoutManagerTest, Maximized) {
+TEST_F(WorkspaceLayoutManagerTest, Maximized) {
   scoped_ptr<aura::Window> w(
       CreateTestWindow(gfx::Rect(0, 0, 100, 100), container()));
   gfx::Rect original_bounds = w->GetTargetBounds();
@@ -267,7 +267,7 @@ TEST_F(DefaultContainerLayoutManagerTest, Maximized) {
 }
 
 // Tests that fullscreen windows get resized after root window is resized.
-TEST_F(DefaultContainerLayoutManagerTest, FullscreenAfterRootWindowResize) {
+TEST_F(WorkspaceLayoutManagerTest, FullscreenAfterRootWindowResize) {
   scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(300, 400),
                                                container()));
   gfx::Rect window_bounds = w1->GetTargetBounds();
@@ -303,7 +303,7 @@ TEST_F(DefaultContainerLayoutManagerTest, FullscreenAfterRootWindowResize) {
 }
 
 // Tests that maximized windows get resized after root_window is resized.
-TEST_F(DefaultContainerLayoutManagerTest, MaximizeAfterRootWindowResize) {
+TEST_F(WorkspaceLayoutManagerTest, MaximizeAfterRootWindowResize) {
   scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(300, 400),
                                                container()));
   gfx::Rect window_bounds = w1->GetTargetBounds();
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 0514a87..197bc50 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -7,9 +7,9 @@
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
-#include "ash/wm/default_container_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace.h"
+#include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"