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

Unified Diff: ash/test/ui_controls_factory_ash.cc

Issue 1898223002: Removes most aura dependencies from WindowResizer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_aura_from_window_state
Patch Set: nit and merge Created 4 years, 8 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.cc ('k') | ash/wm/aura/wm_globals_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ui_controls_factory_ash.cc
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc
index 2ac98c85af60ead2ff62b0c4fc6f6cb701d284b0..af690d08e43ff2c3a92cbcc3a741c8618786058d 100644
--- a/ash/test/ui_controls_factory_ash.cc
+++ b/ash/test/ui_controls_factory_ash.cc
@@ -4,7 +4,8 @@
#include "ash/shell.h"
#include "ash/shell_factory.h"
-#include "ash/wm/coordinate_conversion.h"
+#include "ash/wm/aura/wm_window_aura.h"
+#include "ash/wm/common/root_window_finder.h"
#include "ash/wm/window_properties.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/screen_position_client.h"
@@ -45,7 +46,8 @@ UIControlsAura* GetUIControlsForRootWindow(aura::Window* root_window) {
// Returns the UIControls object for the RootWindow at |point_in_screen|.
UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) {
// TODO(mazda): Support the case passive grab is taken.
- return GetUIControlsForRootWindow(ash::wm::GetRootWindowAt(point_in_screen));
+ return GetUIControlsForRootWindow(wm::WmWindowAura::GetAuraWindow(
+ ash::wm::GetRootWindowAt(point_in_screen)));
}
} // namespace
« no previous file with comments | « ash/shell.cc ('k') | ash/wm/aura/wm_globals_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698