| Index: ash/wm/workspace_controller.cc
|
| ===================================================================
|
| --- ash/wm/workspace_controller.cc (revision 115744)
|
| +++ ash/wm/workspace_controller.cc (working copy)
|
| @@ -16,7 +16,7 @@
|
| #include "ui/aura/root_window.h"
|
| #include "ui/aura/window.h"
|
|
|
| -namespace aura_shell {
|
| +namespace ash {
|
| namespace internal {
|
|
|
| WorkspaceController::WorkspaceController(aura::Window* viewport)
|
| @@ -68,7 +68,7 @@
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// WorkspaceController, aura_shell::internal::WorkspaceObserver overrides:
|
| +// WorkspaceController, ash::internal::WorkspaceObserver overrides:
|
|
|
| void WorkspaceController::WindowMoved(WorkspaceManager* manager,
|
| aura::Window* source,
|
| @@ -95,7 +95,7 @@
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// WorkspaceController, aura_shell::LauncherModelObserver overrides:
|
| +// WorkspaceController, ash::LauncherModelObserver overrides:
|
|
|
| void WorkspaceController::LauncherItemAdded(int index) {
|
| }
|
| @@ -124,4 +124,4 @@
|
| }
|
|
|
| } // namespace internal
|
| -} // namespace aura_shell
|
| +} // namespace ash
|
|
|