Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/ash_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5e46518d3e825dc1c4a2bdba9cd1249754c46289..5f487d8c8ff5b25e82dc67c47564ffb597e5fed1 100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -9,8 +9,8 @@
#include "ash/public/cpp/config.h"
#include "ash/public/cpp/shell_window_ids.h"
+#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/screen_layout_observer.h"
#include "ash/system/status_area_widget.h"
@@ -309,7 +309,7 @@ TEST_F(WebNotificationTrayTest, PopupAndAutoHideShelf) {
// Shelf's auto-hide state won't be HIDDEN unless window exists.
std::unique_ptr<views::Widget> widget(CreateTestWidget());
- WmShelf* shelf = GetPrimaryShelf();
+ Shelf* shelf = GetPrimaryShelf();
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
@@ -342,7 +342,7 @@ TEST_F(WebNotificationTrayTest, PopupAndFullscreen) {
// Checks the work area for normal auto-hidden state.
std::unique_ptr<views::Widget> widget(CreateTestWidget());
- WmShelf* shelf = GetPrimaryShelf();
+ Shelf* shelf = GetPrimaryShelf();
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
int bottom_auto_hidden = GetPopupWorkAreaBottom();
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/ash_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698