Index: ash/wm/workspace/workspace_layout_manager_unittest.cc |
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc |
index dad250beb9f252233a69eb8b23f85519388c7942..74f40d0f1184202bf75b8c74891a9040c2f5f082 100644 |
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc |
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc |
@@ -15,9 +15,9 @@ |
#include "ash/screen_util.h" |
#include "ash/session/session_controller.h" |
#include "ash/shared/app_types.h" |
+#include "ash/shelf/shelf.h" |
#include "ash/shelf/shelf_constants.h" |
#include "ash/shelf/shelf_layout_manager.h" |
-#include "ash/shelf/wm_shelf.h" |
#include "ash/shell.h" |
#include "ash/shell_observer.h" |
#include "ash/shell_port.h" |
@@ -936,7 +936,7 @@ TEST_F(WorkspaceLayoutManagerSoloTest, NotResizeWhenScreenIsLocked) { |
window->SetProperty(aura::client::kAlwaysOnTopKey, true); |
window->Show(); |
- WmShelf* shelf = GetPrimaryShelf(); |
+ Shelf* shelf = GetPrimaryShelf(); |
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); |
window->SetBounds(ScreenUtil::GetMaximizedWindowBoundsInParent(window.get())); |
@@ -1123,7 +1123,7 @@ TEST_F(WorkspaceLayoutManagerBackdropTest, VerifyBackdropAndItsStacking) { |
// Tests that when hidding the shelf, that the backdrop stays fullscreen. |
TEST_F(WorkspaceLayoutManagerBackdropTest, |
ShelfVisibilityDoesNotChangesBounds) { |
- WmShelf* shelf = GetPrimaryShelf(); |
+ Shelf* shelf = GetPrimaryShelf(); |
ShelfLayoutManager* shelf_layout_manager = shelf->shelf_layout_manager(); |
ShowTopWindowBackdrop(true); |
RunAllPendingInMessageLoop(); |