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

Unified Diff: ash/shelf/shelf_widget.cc

Issue 2895843002: chromeos: Eliminate WmWindow from //ash/system (Closed)
Patch Set: Created 3 years, 7 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/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 96fdc65fdc074fef22018daba05e0721ef7c67c6..b19159d163fb7b1527041c7cd21f0d84756e1f5c 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -182,7 +182,8 @@ ShelfWidget::~ShelfWidget() {
void ShelfWidget::CreateStatusAreaWidget(WmWindow* status_container) {
DCHECK(status_container);
DCHECK(!status_area_widget_);
- status_area_widget_ = new StatusAreaWidget(status_container, wm_shelf_);
+ status_area_widget_ = new StatusAreaWidget(
+ WmWindow::GetAuraWindow(status_container), wm_shelf_);
msw 2017/05/22 18:37:11 optional nit: status_container->aura_window()
James Cook 2017/05/22 21:04:54 Done.
status_area_widget_->CreateTrayViews();
// NOTE: Container may be hidden depending on login/display state.
status_area_widget_->Show();
« no previous file with comments | « no previous file | ash/system/palette/mock_palette_tool_delegate.h » ('j') | ash/system/palette/palette_tool_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698