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

Unified Diff: ash/system/tray/system_tray_unittest.cc

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/toast/toast_overlay.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray_unittest.cc
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index 3a27bb78af06ce0a61cb04313ff6c152607e000b..bef16e1c439cab6e2449d19c0a52a5b3d46d6719 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -7,11 +7,11 @@
#include <vector>
#include "ash/common/accessibility_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/system/tray/system_tray_bubble.h"
#include "ash/common/system/tray/system_tray_item.h"
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray/tray_popup_item_container.h"
-#include "ash/shelf/shelf.h"
#include "ash/shell.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/web_notification/web_notification_tray.h"
@@ -178,7 +178,7 @@ TEST_F(SystemTrayTest, SystemTrayColoring) {
TEST_F(SystemTrayTest, SystemTrayColoringAfterAlignmentChange) {
SystemTray* tray = GetPrimarySystemTray();
ASSERT_TRUE(tray->GetWidget());
- Shelf* shelf = Shelf::ForPrimaryDisplay();
+ WmShelf* shelf = GetPrimaryShelf();
shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
// At the beginning the tray coloring is not active.
ASSERT_FALSE(tray->draw_background_as_active());
@@ -350,7 +350,7 @@ TEST_F(SystemTrayTest, BubbleCreationTypesTest) {
// Tests that the tray view is laid out properly and is fully contained within
// the shelf widget.
TEST_F(SystemTrayTest, TrayBoundsInWidget) {
- Shelf* shelf = Shelf::ForPrimaryDisplay();
+ WmShelf* shelf = GetPrimaryShelf();
StatusAreaWidget* widget = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
SystemTray* tray = GetPrimarySystemTray();
« no previous file with comments | « ash/system/toast/toast_overlay.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698