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

Unified Diff: ash/wm/system_gesture_event_filter_unittest.cc

Issue 1901773002: Removes most of aura dependencies from DefaultState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wm_window_positioner
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/wm/panels/panel_window_resizer.cc ('k') | ash/wm/window_animations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter_unittest.cc
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index d8d6d58a562a2e2d996b943e6fd8df0f2306d4e6..902154d5e4f0aeb81bfdf135e25bf13a4794a9d4 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -16,10 +16,11 @@
#include "ash/test/display_manager_test_api.h"
#include "ash/test/shell_test_api.h"
#include "ash/test/test_shelf_delegate.h"
+#include "ash/wm/aura/wm_window_aura.h"
+#include "ash/wm/common/window_positioning_utils.h"
#include "ash/wm/gestures/long_press_affordance_handler.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/window_util.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "ui/aura/env.h"
@@ -485,8 +486,9 @@ TEST_F(SystemGestureEventFilterTest, DragLeftNearEdgeSnaps) {
generator.GestureMultiFingerScroll(
kTouchPoints, points, 120, kSteps, drag_x, 0);
- EXPECT_EQ(wm::GetDefaultLeftSnappedWindowBoundsInParent(
- toplevel_window).ToString(),
+ EXPECT_EQ(ash::wm::GetDefaultLeftSnappedWindowBoundsInParent(
+ ash::wm::WmWindowAura::Get(toplevel_window))
+ .ToString(),
toplevel_window->bounds().ToString());
}
@@ -514,7 +516,8 @@ TEST_F(SystemGestureEventFilterTest, DragRightNearEdgeSnaps) {
generator.GestureMultiFingerScroll(
kTouchPoints, points, 120, kSteps, drag_x, 0);
EXPECT_EQ(wm::GetDefaultRightSnappedWindowBoundsInParent(
- toplevel_window).ToString(),
+ wm::WmWindowAura::Get(toplevel_window))
+ .ToString(),
toplevel_window->bounds().ToString());
}
« no previous file with comments | « ash/wm/panels/panel_window_resizer.cc ('k') | ash/wm/window_animations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698