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

Unified Diff: ash/root_window_controller.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: 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
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 4863239c35e1845b24d5abf017823e1c4f2269da..ed6a66fa7f4a8131a4f33954fbb78f049c1cf175 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -763,8 +763,8 @@ void RootWindowController::InitLayoutManagers() {
WmWindow* status_container =
WmWindowAura::Get(GetContainer(kShellWindowId_StatusContainer));
shelf_widget_.reset(new ShelfWidget(shelf_container, status_container,
+ wm_shelf_aura_.get(),
workspace_controller()));
- wm_shelf_aura_->SetShelfLayoutManager(shelf_widget_->shelf_layout_manager());
workspace_layout_manager_delegate->set_shelf(
shelf_widget_->shelf_layout_manager());
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf_widget.h » ('j') | ash/system/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698