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

Unified Diff: ash/common/test/ash_test.cc

Issue 2408273002: mash: Port TrayUpdateTest to AshTest (Closed)
Patch Set: WmShellTestApi Created 4 years, 2 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/common/test/ash_test.h ('k') | ash/common/test/wm_shell_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/test/ash_test.cc
diff --git a/ash/common/test/ash_test.cc b/ash/common/test/ash_test.cc
index aefe98345470a0fad7f3f5e262fc2d538dbf8215..32744b9c82da250a983050b173c90ad0847995bc 100644
--- a/ash/common/test/ash_test.cc
+++ b/ash/common/test/ash_test.cc
@@ -4,6 +4,8 @@
#include "ash/common/test/ash_test.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/system/status_area_widget.h"
#include "ash/common/test/ash_test_impl.h"
#include "ash/common/test/test_session_state_delegate.h"
#include "ash/common/wm_root_window_controller.h"
@@ -33,6 +35,11 @@ WmShelf* AshTest::GetPrimaryShelf() {
->GetShelf();
}
+// static
+SystemTray* AshTest::GetPrimarySystemTray() {
+ return GetPrimaryShelf()->GetStatusAreaWidget()->system_tray();
+}
+
bool AshTest::SupportsMultipleDisplays() const {
return test_impl_->SupportsMultipleDisplays();
}
« no previous file with comments | « ash/common/test/ash_test.h ('k') | ash/common/test/wm_shell_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698