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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/shelf_window_watcher_unittest.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Sync and rebase. 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
« ash/shelf/shelf_widget_unittest.cc ('K') | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shelf/wm_shelf.h » ('j') | ash/shell.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_window_watcher_unittest.cc
diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc
index 9a93712b3c1def7537f863184962be3770958dd2..fd0b7b3c287dcbee27d26309220cfd8f16d11c80 100644
--- a/ash/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/shelf/shelf_window_watcher_unittest.cc
@@ -282,9 +282,7 @@ TEST_F(ShelfWindowWatcherTest, PanelWindow) {
views::Widget panel_widget;
views::Widget::InitParams panel_params(views::Widget::InitParams::TYPE_PANEL);
panel_params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
- ShellPort::Get()
- ->GetPrimaryRootWindow()
- ->GetRootWindowController()
+ Shell::GetPrimaryRootWindowController()
->ConfigureWidgetInitParamsForContainer(
&panel_widget, kShellWindowId_PanelContainer, &panel_params);
panel_widget.Init(panel_params);
« ash/shelf/shelf_widget_unittest.cc ('K') | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shelf/wm_shelf.h » ('j') | ash/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698