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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell_unittest.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Fix WmShelf::ForWindow. 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
« no previous file with comments | « ash/shell_port.cc ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index f4a8488cf45ef3cbc249f5304b411bdc2c2bbbfb..c461f6617c4664f9d9ab4f7e0bf7d57c6fd0a537 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -352,9 +352,7 @@ TEST_F(ShellTest, LockScreenClosesActiveMenu) {
std::unique_ptr<ui::SimpleMenuModel> menu_model(
new ui::SimpleMenuModel(&menu_delegate));
menu_model->AddItem(0, base::ASCIIToUTF16("Menu item"));
- views::Widget* widget = ShellPort::Get()
- ->GetPrimaryRootWindow()
- ->GetRootWindowController()
+ views::Widget* widget = Shell::GetPrimaryRootWindowController()
->wallpaper_widget_controller()
->widget();
std::unique_ptr<views::MenuRunner> menu_runner(
« no previous file with comments | « ash/shell_port.cc ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698