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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/focus_cycler_unittest.cc

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/common/shelf/wm_shelf.h ('k') | ash/mus/bridge/wm_shelf_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/focus_cycler_unittest.cc
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index 7d20988c9441eb1ac253890d6533f7529b81860b..664a32f020953aca75f1f3e0af2cdb1a9c4082ad 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -96,7 +96,7 @@ class FocusCyclerTest : public AshTestBase {
WmShell::Get()->GetRootWindowForNewWindows()->GetChildByShellWindowId(
kShellWindowId_StatusContainer);
- StatusAreaWidget* widget = new StatusAreaWidget(parent, shelf_widget());
+ StatusAreaWidget* widget = new StatusAreaWidget(parent, GetPrimaryShelf());
widget->CreateTrayViews();
widget->Show();
tray_.reset(widget->system_tray());
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/mus/bridge/wm_shelf_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698