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

Unified Diff: ash/focus_cycler_unittest.cc

Issue 1659283002: ash: Explicitly teach various components about ShelfLayoutManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ozone-ui-event-platform-event
Patch Set: fix-test Created 4 years, 11 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 | « no previous file | ash/shelf/overflow_bubble.cc » ('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 8e263a77ea6e526776c6cdb6a2213fc695129c85..64ed1fe0ca4c3447f0a3c5770581cdc4972de302 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf.h"
+#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/shell_factory.h"
@@ -93,7 +94,9 @@ class FocusCyclerTest : public AshTestBase {
Shell::GetPrimaryRootWindowController()->GetContainer(
ash::kShellWindowId_StatusContainer);
- StatusAreaWidget* widget = new StatusAreaWidget(parent);
+ StatusAreaWidget* widget = new StatusAreaWidget(
+ parent,
+ ShelfLayoutManager::ForShelf(parent->GetRootWindow())->shelf_widget());
widget->CreateTrayViews();
widget->Show();
tray_.reset(widget->system_tray());
« no previous file with comments | « no previous file | ash/shelf/overflow_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698