Index: ash/system/web_notification/web_notification_tray_unittest.cc |
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc |
index 3a8e52ba87c109176dd2c9118f5a5fb6ac4c2287..991f71a73285fce2da6aef7b13f47ae91fa4855a 100644 |
--- a/ash/system/web_notification/web_notification_tray_unittest.cc |
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc |
@@ -7,6 +7,7 @@ |
#include <utility> |
#include <vector> |
+#include "ash/common/shelf/wm_shelf.h" |
#include "ash/common/shell_window_ids.h" |
#include "ash/common/system/tray/system_tray_item.h" |
#include "ash/common/wm/window_state.h" |
@@ -15,7 +16,6 @@ |
#include "ash/common/wm_shell.h" |
#include "ash/common/wm_window.h" |
#include "ash/display/display_manager.h" |
-#include "ash/shelf/shelf_layout_manager.h" |
#include "ash/shell.h" |
#include "ash/system/status_area_widget.h" |
#include "ash/system/tray/system_tray.h" |
@@ -369,7 +369,7 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndAutoHideShelf) { |
// Shelf's auto-hide state won't be HIDDEN unless window exists. |
std::unique_ptr<views::Widget> widget(CreateTestWidget()); |
- Shelf* shelf = Shelf::ForPrimaryDisplay(); |
+ WmShelf* shelf = WmShelf::ForPrimaryDisplay(); |
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); |
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState()); |
@@ -401,7 +401,7 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndAutoHideShelf) { |
// Close the system tray. |
GetSystemTray()->ClickedOutsideBubble(); |
- shelf->shelf_layout_manager()->UpdateAutoHideState(); |
+ shelf->UpdateAutoHideState(); |
RunAllPendingInMessageLoop(); |
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState()); |
int bottom_hidden_with_tray_notification = GetPopupWorkAreaBottom(); |
@@ -425,7 +425,7 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndFullscreen) { |
// Checks the work area for normal auto-hidden state. |
std::unique_ptr<views::Widget> widget(CreateTestWidget()); |
- Shelf* shelf = Shelf::ForPrimaryDisplay(); |
+ WmShelf* shelf = WmShelf::ForPrimaryDisplay(); |
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); |
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState()); |
int bottom_auto_hidden = GetPopupWorkAreaBottom(); |
@@ -453,13 +453,13 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndFullscreen) { |
display::Screen::GetScreen()->GetPrimaryDisplay().bounds().bottom_right(); |
bottom_right.Offset(-1, -1); |
generator.MoveMouseTo(bottom_right); |
- shelf->shelf_layout_manager()->UpdateAutoHideStateNow(); |
+ shelf->UpdateVisibilityState(); |
msw
2016/06/25 00:18:30
ditto q: Should this be UpdateAutoHideState?
James Cook
2016/06/25 01:20:58
No, these have to be a synchronous update. UpdateA
msw
2016/06/27 18:11:35
This is fine, I was just checking that it was inte
|
EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); |
EXPECT_EQ(bottom, GetPopupWorkAreaBottom()); |
generator.MoveMouseTo( |
display::Screen::GetScreen()->GetPrimaryDisplay().bounds().CenterPoint()); |
- shelf->shelf_layout_manager()->UpdateAutoHideStateNow(); |
+ shelf->UpdateVisibilityState(); |
msw
2016/06/25 00:18:30
ditto q: Should this be UpdateAutoHideState?
|
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState()); |
EXPECT_EQ(bottom_auto_hidden, GetPopupWorkAreaBottom()); |
} |