| Index: ash/wm/workspace/workspace_layout_manager.cc
|
| diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc
|
| index 1b4b4afd67c04167922621d1d571e2ddb7ea14d2..c817141fa14a293976dd98083c1b7726d5407f23 100644
|
| --- a/ash/wm/workspace/workspace_layout_manager.cc
|
| +++ b/ash/wm/workspace/workspace_layout_manager.cc
|
| @@ -32,8 +32,6 @@ using aura::Window;
|
|
|
| namespace ash {
|
|
|
| -namespace internal {
|
| -
|
| WorkspaceLayoutManager::WorkspaceLayoutManager(aura::Window* window)
|
| : shelf_(NULL),
|
| window_(window),
|
| @@ -57,7 +55,7 @@ WorkspaceLayoutManager::~WorkspaceLayoutManager() {
|
| Shell::GetInstance()->activation_client()->RemoveObserver(this);
|
| }
|
|
|
| -void WorkspaceLayoutManager::SetShelf(internal::ShelfLayoutManager* shelf) {
|
| +void WorkspaceLayoutManager::SetShelf(ShelfLayoutManager* shelf) {
|
| shelf_ = shelf;
|
| }
|
|
|
| @@ -281,5 +279,4 @@ void WorkspaceLayoutManager::UpdateFullscreenState() {
|
| }
|
| }
|
|
|
| -} // namespace internal
|
| } // namespace ash
|
|
|