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

Unified Diff: ash/aura/shell_port_classic.cc

Issue 2919533002: [mus+ash] removes WmWindow, wm_window.h and wm_window.cc (Closed)
Patch Set: [mus+ash] removes WmWindow, wm_window.h and wm_window.cc (fixes build) 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/aura/shell_port_classic.h ('k') | ash/mus/bridge/shell_port_mash.h » ('j') | no next file with comments »
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 4603cb55d4f92351e7d75124f9de1ea8f1c11cd3..acea8770e76c443f036a8e8d14ed09b73d31a516 100644
--- a/ash/aura/shell_port_classic.cc
+++ b/ash/aura/shell_port_classic.cc
@@ -33,7 +33,6 @@
#include "ash/wm/window_util.h"
#include "ash/wm/workspace/workspace_event_handler_aura.h"
#include "ash/wm_display_observer.h"
-#include "ash/wm_window.h"
#include "base/memory/ptr_util.h"
#include "ui/aura/env.h"
#include "ui/display/manager/chromeos/default_touch_transform_setter.h"
@@ -150,13 +149,8 @@ bool ShellPortClassic::IsMouseEventsEnabled() {
return Shell::Get()->cursor_manager()->IsMouseEventsEnabled();
}
-std::vector<WmWindow*> ShellPortClassic::GetAllRootWindows() {
- aura::Window::Windows root_windows =
- Shell::Get()->window_tree_host_manager()->GetAllRootWindows();
- std::vector<WmWindow*> wm_windows(root_windows.size());
- for (size_t i = 0; i < root_windows.size(); ++i)
- wm_windows[i] = WmWindow::Get(root_windows[i]);
- return wm_windows;
+std::vector<aura::Window*> ShellPortClassic::GetAllRootWindows() {
+ return Shell::Get()->window_tree_host_manager()->GetAllRootWindows();
}
void ShellPortClassic::RecordUserMetricsAction(UserMetricsAction action) {
« no previous file with comments | « ash/aura/shell_port_classic.h ('k') | ash/mus/bridge/shell_port_mash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698