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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/aura/shell_port_classic.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/app_list/app_list_delegate_impl.cc ('K') | « ash/aura/shell_port_classic.h ('k') | ash/drag_drop/drag_drop_tracker_unittest.cc » ('j') | ash/first_run/first_run_helper_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/shell_port_classic.cc
diff --git a/ash/aura/shell_port_classic.cc b/ash/aura/shell_port_classic.cc
index 0e977f51549af9273b2c31bbfd90726a4497195f..70a5e92c28b3f1c4a61c94bcf5756bf9f8e1b493 100644
--- a/ash/aura/shell_port_classic.cc
+++ b/ash/aura/shell_port_classic.cc
@@ -78,9 +78,8 @@ Config ShellPortClassic::GetAshConfig() const {
return Config::CLASSIC;
}
-WmWindow* ShellPortClassic::GetPrimaryRootWindow() {
- return WmWindow::Get(
- Shell::Get()->window_tree_host_manager()->GetPrimaryRootWindow());
+aura::Window* ShellPortClassic::GetPrimaryRootWindow() {
+ return Shell::Get()->window_tree_host_manager()->GetPrimaryRootWindow();
}
WmWindow* ShellPortClassic::GetRootWindowForDisplayId(int64_t display_id) {
« ash/app_list/app_list_delegate_impl.cc ('K') | « ash/aura/shell_port_classic.h ('k') | ash/drag_drop/drag_drop_tracker_unittest.cc » ('j') | ash/first_run/first_run_helper_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698