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

Unified Diff: ash/test/ash_test_base.h

Issue 2072023003: mash: Break ash system tray dependencies on ash::ShelfWidget (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/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index df73c7d848f1a5e3d357d9af3a9fe4e882f2db51..8a7bd7ccf04827324aef1a0134e49dd952dc83f5 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -63,6 +63,9 @@ class AshTestBase : public testing::Test {
void SetUp() override;
void TearDown() override;
+ // Returns the system tray on the primary display.
+ static SystemTray* GetPrimarySystemTray();
+
// Update the display configuration as given in |display_specs|.
// See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
void UpdateDisplay(const std::string& display_specs);
@@ -129,9 +132,6 @@ class AshTestBase : public testing::Test {
TestScreenshotDelegate* GetScreenshotDelegate();
- // Returns the system tray on the primary display.
- SystemTray* GetPrimarySystemTray();
-
TestSystemTrayDelegate* GetSystemTrayDelegate();
// Utility methods to emulate user logged in or not, session started or not
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698