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

Unified Diff: ash/wm/container_finder.cc

Issue 2900423002: [mus+ash] Removes WmWindow from ash/wm/root_window_finder.h (Closed)
Patch Set: Remove WmWindow from ash/wm/root_window_finder.h (tab drag test) 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/test/ui_controls_factory_ash.cc ('k') | ash/wm/root_window_finder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/container_finder.cc
diff --git a/ash/wm/container_finder.cc b/ash/wm/container_finder.cc
index e5cb9aabf492b5e5ce90fb5f6a64708209b5a768..ea9bd895026396b5b40ba9fba78fe57b2514e4d0 100644
--- a/ash/wm/container_finder.cc
+++ b/ash/wm/container_finder.cc
@@ -12,7 +12,6 @@
#include "ash/wm/always_on_top_controller.h"
#include "ash/wm/root_window_finder.h"
#include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/gfx/geometry/rect.h"
@@ -25,8 +24,7 @@ namespace {
aura::Window* FindContainerRoot(const gfx::Rect& bounds) {
if (bounds == gfx::Rect())
return Shell::GetRootWindowForNewWindows();
- WmWindow* root = GetRootWindowMatching(bounds);
- return root ? root->aura_window() : nullptr;
+ return GetRootWindowMatching(bounds);
}
bool HasTransientParentWindow(const aura::Window* window) {
« no previous file with comments | « ash/test/ui_controls_factory_ash.cc ('k') | ash/wm/root_window_finder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698